From aade8856ee8c30c28035cb87920026c0954ff203 Mon Sep 17 00:00:00 2001 From: Andrew Kelley Date: Fri, 8 Jul 2022 21:28:06 -0700 Subject: [PATCH] CI: update scripts to stage1 LLVM 14 tarballs The previous tarballs were stage3 which is not quite ready for primetime yet. --- ci/azure/macos_arm64_script | 4 ++-- ci/azure/macos_script | 2 +- ci/azure/pipelines.yml | 2 +- ci/drone/drone.yml | 18 +++++++++--------- ci/srht/freebsd_script | 2 +- ci/zinc/drone.yml | 4 ++-- 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/ci/azure/macos_arm64_script b/ci/azure/macos_arm64_script index 023d5a6ff9..4df3106f31 100755 --- a/ci/azure/macos_arm64_script +++ b/ci/azure/macos_arm64_script @@ -10,13 +10,13 @@ ZIGDIR="$(pwd)" HOST_ARCH="x86_64" HOST_TARGET="$HOST_ARCH-macos-none" HOST_MCPU="baseline" -HOST_CACHE_BASENAME="zig+llvm+lld+clang-$HOST_TARGET-0.10.0-dev.2929+6a3a0fe7a" +HOST_CACHE_BASENAME="zig+llvm+lld+clang-$HOST_TARGET-0.10.0-dev.2931+bdf3fa12f" HOST_PREFIX="$HOME/$HOST_CACHE_BASENAME" ARCH="aarch64" TARGET="$ARCH-macos-none" MCPU="apple_a14" -CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.10.0-dev.2929+6a3a0fe7a" +CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.10.0-dev.2931+bdf3fa12f" PREFIX="$HOME/$CACHE_BASENAME" JOBS="-j2" diff --git a/ci/azure/macos_script b/ci/azure/macos_script index 65063a1e72..faf135ff3e 100755 --- a/ci/azure/macos_script +++ b/ci/azure/macos_script @@ -9,7 +9,7 @@ ZIGDIR="$(pwd)" ARCH="x86_64" TARGET="$ARCH-macos-none" MCPU="baseline" -CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.10.0-dev.2929+6a3a0fe7a" +CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.10.0-dev.2931+bdf3fa12f" PREFIX="$HOME/$CACHE_BASENAME" JOBS="-j2" diff --git a/ci/azure/pipelines.yml b/ci/azure/pipelines.yml index 2cf67199a5..e74a08667c 100644 --- a/ci/azure/pipelines.yml +++ b/ci/azure/pipelines.yml @@ -27,7 +27,7 @@ jobs: vmImage: 'windows-2019' variables: TARGET: 'x86_64-windows-gnu' - ZIG_LLVM_CLANG_LLD_NAME: 'zig+llvm+lld+clang-${{ variables.TARGET }}-0.10.0-dev.2929+6a3a0fe7a' + ZIG_LLVM_CLANG_LLD_NAME: 'zig+llvm+lld+clang-${{ variables.TARGET }}-0.10.0-dev.2931+bdf3fa12f' ZIG_LLVM_CLANG_LLD_URL: 'https://ziglang.org/deps/${{ variables.ZIG_LLVM_CLANG_LLD_NAME }}.zip' steps: - pwsh: | diff --git a/ci/drone/drone.yml b/ci/drone/drone.yml index 09ab4bf100..a1eda8c5c5 100644 --- a/ci/drone/drone.yml +++ b/ci/drone/drone.yml @@ -7,56 +7,56 @@ platform: steps: - name: build - image: ziglang/static-base:llvm14-aarch64-2 + image: ziglang/static-base:llvm14-aarch64-3 commands: - ./ci/drone/linux_script_build - name: test-1 depends_on: - build - image: ziglang/static-base:llvm14-aarch64-2 + image: ziglang/static-base:llvm14-aarch64-3 commands: - ./ci/drone/linux_script_test 1 - name: test-2 depends_on: - build - image: ziglang/static-base:llvm14-aarch64-2 + image: ziglang/static-base:llvm14-aarch64-3 commands: - ./ci/drone/linux_script_test 2 - name: test-3 depends_on: - build - image: ziglang/static-base:llvm14-aarch64-2 + image: ziglang/static-base:llvm14-aarch64-3 commands: - ./ci/drone/linux_script_test 3 - name: test-4 depends_on: - build - image: ziglang/static-base:llvm14-aarch64-2 + image: ziglang/static-base:llvm14-aarch64-3 commands: - ./ci/drone/linux_script_test 4 - name: test-5 depends_on: - build - image: ziglang/static-base:llvm14-aarch64-2 + image: ziglang/static-base:llvm14-aarch64-3 commands: - ./ci/drone/linux_script_test 5 - name: test-6 depends_on: - build - image: ziglang/static-base:llvm14-aarch64-2 + image: ziglang/static-base:llvm14-aarch64-3 commands: - ./ci/drone/linux_script_test 6 - name: test-7 depends_on: - build - image: ziglang/static-base:llvm14-aarch64-2 + image: ziglang/static-base:llvm14-aarch64-3 commands: - ./ci/drone/linux_script_test 7 @@ -70,7 +70,7 @@ steps: - test-5 - test-6 - test-7 - image: ziglang/static-base:llvm14-aarch64-2 + image: ziglang/static-base:llvm14-aarch64-3 environment: SRHT_OAUTH_TOKEN: from_secret: SRHT_OAUTH_TOKEN diff --git a/ci/srht/freebsd_script b/ci/srht/freebsd_script index 4c395c4d4c..9fd7c0be65 100755 --- a/ci/srht/freebsd_script +++ b/ci/srht/freebsd_script @@ -7,7 +7,7 @@ sudo pkg update -fq sudo pkg install -y cmake py39-s3cmd wget curl jq samurai ZIGDIR="$(pwd)" -CACHE_BASENAME="zig+llvm+lld+clang-x86_64-freebsd-gnu-0.10.0-dev.2929+6a3a0fe7a" +CACHE_BASENAME="zig+llvm+lld+clang-x86_64-freebsd-gnu-0.10.0-dev.2931+bdf3fa12f" PREFIX="$HOME/$CACHE_BASENAME" cd $HOME diff --git a/ci/zinc/drone.yml b/ci/zinc/drone.yml index bff71f5872..6bb7d73b41 100644 --- a/ci/zinc/drone.yml +++ b/ci/zinc/drone.yml @@ -10,7 +10,7 @@ workspace: steps: - name: test - image: ci/debian-amd64:11.1-5 + image: ci/debian-amd64:11.1-6 commands: - ./ci/zinc/linux_test.sh @@ -22,7 +22,7 @@ steps: - master event: - push - image: ci/debian-amd64:11.1-5 + image: ci/debian-amd64:11.1-6 environment: AWS_ACCESS_KEY_ID: from_secret: AWS_ACCESS_KEY_ID