From 695a746aa09ac68e0ece8def2d5c7ce6d71f3000 Mon Sep 17 00:00:00 2001 From: Andrew Kelley Date: Thu, 24 Oct 2019 20:45:54 -0400 Subject: [PATCH] ci: use x86_64 namespaced docker image I took a risk that docker had implemented namespacing with regards to architectures correctly, but of course they didn't. So the CI docker image for x86_64 was clobbered by an aarch64 image with the same name. Now we're doing arch namespaces with the tag name, so here's the x86_64 one. --- ci/azure/linux_script | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/azure/linux_script b/ci/azure/linux_script index e12f16f15..c4222f6ce 100755 --- a/ci/azure/linux_script +++ b/ci/azure/linux_script @@ -25,7 +25,7 @@ make -j2 install if [ "${BUILD_REASON}" != "PullRequest" ]; then ARTIFACTSDIR="$BUILDDIR/artifacts" mkdir "$ARTIFACTSDIR" - docker run -i --mount type=bind,source="$ARTIFACTSDIR",target=/z ziglang/static-base:llvm9-1 -j2 $BUILD_SOURCEVERSION + docker run -i --mount type=bind,source="$ARTIFACTSDIR",target=/z ziglang/static-base:llvm9-x86_64 -j2 $BUILD_SOURCEVERSION TARBALL="$(ls $ARTIFACTSDIR)" mv "$DOWNLOADSECUREFILE_SECUREFILEPATH" "$HOME/.s3cfg" s3cmd put -P --add-header="cache-control: public, max-age=31536000, immutable" "$ARTIFACTSDIR/$TARBALL" s3://ziglang.org/builds/