Merge #926

926: fix for real r=Alexhuszagh a=Emilgardis - make env var uppercase Co-authored-by: Emil Gardström <[email protected]>
cross-rs · Jul 8, 2022 · 66c0633 · 66c0633
2 parents 3d6a52a + ac862da
commit 66c0633
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -307,7 +307,7 @@ jobs:
  run: ./ci/test-cross-image.sh
  env:
  TARGET: 'aarch64-unknown-linux-gnu'
- IMAGE: 'ghcr.io/cross-rs/cross/aarch64-unknown-linux-gnu:main'
+ IMAGE: 'ghcr.io/cross-rs/aarch64-unknown-linux-gnu:main'
  shell: bash
 
  - name: Login to GitHub Container Registry
@@ -389,7 +389,7 @@ jobs:
  - name: Run Docker-in-Docker Test
  env:
  TARGET: aarch64-unknown-linux-gnu
- IMAGE: 'ghcr.io/cross-rs/cross/aarch64-unknown-linux-gnu:main'
+ IMAGE: 'ghcr.io/cross-rs/aarch64-unknown-linux-gnu:main'
  run: ./ci/test-docker-in-docker.sh
  shell: bash
 

diff --git a/ci/test-cross-image.sh b/ci/test-cross-image.sh
@@ -7,10 +7,13 @@ set -eo pipefail
 if [[ -z "${TARGET}" ]]; then
  export TARGET="aarch64-unknown-linux-gnu"
 fi
+# ^^subst is not supported on macOS bash (bash <4)
+# shellcheck disable=SC2155
+export TARGET_UPPER=$(echo "$TARGET" | awk '{print toupper($0)}')
 
 if [[ "${IMAGE}" ]]; then
  # shellcheck disable=SC2140
- export "CROSS_TARGET_${TARGET//-/_}_IMAGE"="${IMAGE}"
+ export "CROSS_TARGET_${TARGET_UPPER//-/_}_IMAGE"="${IMAGE}"
 fi
 
 if [[ -z "${CROSS_TARGET_CROSS_IMAGE}" ]]; then
@@ -20,7 +23,7 @@ fi
 
 main() {
 
- docker run --rm -e TARGET -e "CROSS_TARGET_${TARGET//-/_}_IMAGE" \
+ docker run --rm -e TARGET -e "CROSS_TARGET_${TARGET_UPPER//-/_}_IMAGE" \
  -v /var/run/docker.sock:/var/run/docker.sock \
  "${CROSS_TARGET_CROSS_IMAGE}" sh -c '
 #!/usr/bin/env sh

diff --git a/ci/test-docker-in-docker.sh b/ci/test-docker-in-docker.sh
@@ -9,10 +9,13 @@ set -eo pipefail
 if [[ -z "${TARGET}" ]]; then
  export TARGET="aarch64-unknown-linux-gnu"
 fi
+# ^^subst is not supported on macOS bash (bash <4)
+# shellcheck disable=SC2155
+export TARGET_UPPER=$(echo "$TARGET" | awk '{print toupper($0)}')
 
 if [[ "${IMAGE}" ]]; then
  # shellcheck disable=SC2140
- export "CROSS_TARGET_${TARGET//-/_}_IMAGE"="${IMAGE}"
+ export "CROSS_TARGET_${TARGET_UPPER//-/_}_IMAGE"="${IMAGE}"
 fi
 
 source=$(dirname "${BASH_SOURCE[0]}")
@@ -23,7 +26,7 @@ main() {
  docker run -v "${home}":"${home}" -w "${home}" \
  --rm -e TARGET -e RUSTFLAGS -e RUST_TEST_THREADS \
  -e LLVM_PROFILE_FILE -e CARGO_INCREMENTAL \
- -e "CROSS_TARGET_${TARGET//-/_}_IMAGE" \
+ -e "CROSS_TARGET_${TARGET_UPPER//-/_}_IMAGE" \
  -v /var/run/docker.sock:/var/run/docker.sock \
  docker:18.09-dind sh -c '
 #!/usr/bin/env sh