use image from main in test for cross dind test

cross-rs · Jul 8, 2022 · 018f166 · 018f166
1 parent f6e67ce
commit 018f166
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -307,6 +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'
         shell: bash
 
       - name: Login to GitHub Container Registry

diff --git a/ci/test-cross-image.sh b/ci/test-cross-image.sh
@@ -7,12 +7,19 @@ set -eo pipefail
 if [[ -z "${TARGET}" ]]; then
     export TARGET="aarch64-unknown-linux-gnu"
 fi
+
+if [[ "${IMAGE}" ]]; then
+      export "CROSS_TARGET_${TARGET//-/_}_IMAGE"="${IMAGE}"
+fi
+
 if [[ -z "${CROSS_TARGET_CROSS_IMAGE}" ]]; then
     CROSS_TARGET_CROSS_IMAGE="ghcr.io/cross-rs/cross:main"
 fi
 
+
 main() {
-    docker run --rm -e TARGET \
+
+    docker run --rm -e TARGET -e "CROSS_TARGET_${TARGET}_IMAGE" \
         -v /var/run/docker.sock:/var/run/docker.sock \
         "${CROSS_TARGET_CROSS_IMAGE}" sh -c '
 #!/usr/bin/env sh