aboutsummaryrefslogtreecommitdiff
path: root/ci
diff options
context:
space:
mode:
authorAndrew Kelley <andrew@ziglang.org>2021-10-01 16:03:37 -0700
committerAndrew Kelley <andrew@ziglang.org>2021-10-01 16:07:42 -0700
commit7350cb2fc73a9ce5c6ad373f82f254bc87053bbd (patch)
tree72953e96d88a14cfbced37d6a7e5bf7047503a76 /ci
parent456d7e5f5f5aa09b3b50ebf1398d79503846a801 (diff)
downloadzig-7350cb2fc73a9ce5c6ad373f82f254bc87053bbd.tar.gz
zig-7350cb2fc73a9ce5c6ad373f82f254bc87053bbd.zip
ci: update tarballs for LLVM 13
NetBSD CI is disabled because it is not yet supported in zig-bootstrap. Once NetBSD has proper zig-bootstrap support, it can be re-enabled. Windows is not solved here yet; will be pushing a separate commit for that.
Diffstat (limited to 'ci')
-rwxr-xr-xci/azure/linux_script2
-rwxr-xr-xci/azure/macos_arm64_script4
-rwxr-xr-xci/azure/macos_script2
-rw-r--r--ci/drone/drone.yml10
-rwxr-xr-xci/srht/freebsd_script2
-rw-r--r--ci/srht/index.json5
-rwxr-xr-xci/srht/update_download_page12
7 files changed, 16 insertions, 21 deletions
diff --git a/ci/azure/linux_script b/ci/azure/linux_script
index 3a1f8b8928..065576bef4 100755
--- a/ci/azure/linux_script
+++ b/ci/azure/linux_script
@@ -9,7 +9,7 @@ sudo apt-get install -y cmake s3cmd tidy
ZIGDIR="$(pwd)"
ARCH="$(uname -m)"
TARGET="$ARCH-linux-musl"
-CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.8.1-dev.94+535615117"
+CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.9.0-dev.1243+456d7e5f5"
PREFIX="$HOME/$CACHE_BASENAME"
MCPU="baseline"
JOBS="-j$(nproc)"
diff --git a/ci/azure/macos_arm64_script b/ci/azure/macos_arm64_script
index d3eb7bdeaa..c09e0ebe0c 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-gnu"
HOST_MCPU="baseline"
-HOST_CACHE_BASENAME="zig+llvm+lld+clang-$HOST_TARGET-0.8.0-dev.2703+c12704a33"
+HOST_CACHE_BASENAME="zig+llvm+lld+clang-$HOST_TARGET-0.9.0-dev.1243+456d7e5f5"
HOST_PREFIX="$HOME/$HOST_CACHE_BASENAME"
ARCH="aarch64"
TARGET="$ARCH-macos-gnu"
MCPU="apple_a14"
-CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.8.0-dev.2703+c12704a33"
+CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.9.0-dev.1243+456d7e5f5"
PREFIX="$HOME/$CACHE_BASENAME"
JOBS="-j2"
diff --git a/ci/azure/macos_script b/ci/azure/macos_script
index 8dac57d2f9..9eb20ba308 100755
--- a/ci/azure/macos_script
+++ b/ci/azure/macos_script
@@ -9,7 +9,7 @@ ZIGDIR="$(pwd)"
ARCH="x86_64"
TARGET="$ARCH-macos-gnu"
MCPU="baseline"
-CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.8.1-dev.94+535615117"
+CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.9.0-dev.1243+456d7e5f5"
PREFIX="$HOME/$CACHE_BASENAME"
JOBS="-j2"
diff --git a/ci/drone/drone.yml b/ci/drone/drone.yml
index 21b731b842..42be011204 100644
--- a/ci/drone/drone.yml
+++ b/ci/drone/drone.yml
@@ -7,28 +7,28 @@ platform:
steps:
- name: build
- image: ziglang/static-base:llvm13-aarch64-5
+ image: ziglang/static-base:llvm13-aarch64-1
commands:
- ./ci/drone/linux_script_build
- name: test-1
depends_on:
- build
- image: ziglang/static-base:llvm13-aarch64-5
+ image: ziglang/static-base:llvm13-aarch64-1
commands:
- ./ci/drone/linux_script_test 1
- name: test-2
depends_on:
- build
- image: ziglang/static-base:llvm13-aarch64-5
+ image: ziglang/static-base:llvm13-aarch64-1
commands:
- ./ci/drone/linux_script_test 2
- name: test-3
depends_on:
- build
- image: ziglang/static-base:llvm13-aarch64-5
+ image: ziglang/static-base:llvm13-aarch64-1
commands:
- ./ci/drone/linux_script_test 3
@@ -38,7 +38,7 @@ steps:
- test-1
- test-2
- test-3
- image: ziglang/static-base:llvm13-aarch64-5
+ image: ziglang/static-base:llvm13-aarch64-1
environment:
SRHT_OAUTH_TOKEN:
from_secret: SRHT_OAUTH_TOKEN
diff --git a/ci/srht/freebsd_script b/ci/srht/freebsd_script
index 27c7df4933..a2b8d4afea 100755
--- a/ci/srht/freebsd_script
+++ b/ci/srht/freebsd_script
@@ -7,7 +7,7 @@ sudo pkg update -fq
sudo pkg install -y cmake py38-s3cmd wget curl jq samurai
ZIGDIR="$(pwd)"
-CACHE_BASENAME="zig+llvm+lld+clang-x86_64-freebsd-gnu-0.8.0-dev.2703+c12704a33"
+CACHE_BASENAME="zig+llvm+lld+clang-x86_64-freebsd-gnu-0.9.0-dev.1243+456d7e5f5"
PREFIX="$HOME/$CACHE_BASENAME"
cd $HOME
diff --git a/ci/srht/index.json b/ci/srht/index.json
index e24672c348..26562d7a17 100644
--- a/ci/srht/index.json
+++ b/ci/srht/index.json
@@ -14,11 +14,6 @@
"shasum": "{{X86_64_FREEBSD_SHASUM}}",
"size": "{{X86_64_FREEBSD_BYTESIZE}}"
},
- "x86_64-netbsd": {
- "tarball": "https://ziglang.org/builds/{{X86_64_NETBSD_TARBALL}}",
- "shasum": "{{X86_64_NETBSD_SHASUM}}",
- "size": "{{X86_64_NETBSD_BYTESIZE}}"
- },
"x86_64-macos": {
"tarball": "https://ziglang.org/builds/{{X86_64_MACOS_TARBALL}}",
"shasum": "{{X86_64_MACOS_SHASUM}}",
diff --git a/ci/srht/update_download_page b/ci/srht/update_download_page
index 490388ca78..f064712d4e 100755
--- a/ci/srht/update_download_page
+++ b/ci/srht/update_download_page
@@ -15,7 +15,7 @@ X86_64_WINDOWS_JSON_URL="https://ziglang.org/builds/x86_64-windows-$VERSION.json
AARCH64_MACOS_JSON_URL="https://ziglang.org/builds/aarch64-macos-$VERSION.json"
X86_64_MACOS_JSON_URL="https://ziglang.org/builds/x86_64-macos-$VERSION.json"
X86_64_FREEBSD_JSON_URL="https://ziglang.org/builds/x86_64-freebsd-$VERSION.json"
-X86_64_NETBSD_JSON_URL="https://ziglang.org/builds/x86_64-netbsd-$VERSION.json"
+#X86_64_NETBSD_JSON_URL="https://ziglang.org/builds/x86_64-netbsd-$VERSION.json"
# If any of these fail, it's not really this job failing; rather we have detected
# that this job will be called again later when other jobs have completed.
@@ -25,7 +25,7 @@ curl --fail -I "$X86_64_WINDOWS_JSON_URL" >/dev/null || exit 0
curl --fail -I "$AARCH64_MACOS_JSON_URL" >/dev/null || exit 0
curl --fail -I "$X86_64_MACOS_JSON_URL" >/dev/null || exit 0
curl --fail -I "$X86_64_FREEBSD_JSON_URL" >/dev/null || exit 0
-curl --fail -I "$X86_64_NETBSD_JSON_URL" >/dev/null || exit 0
+#curl --fail -I "$X86_64_NETBSD_JSON_URL" >/dev/null || exit 0
# Without --user, this gave me:
# ERROR: Could not install packages due to an EnvironmentError: [Errno 13] Permission denied
@@ -86,10 +86,10 @@ export X86_64_FREEBSD_TARBALL="$(echo "$X86_64_FREEBSD_JSON" | jq .tarball -r)"
export X86_64_FREEBSD_BYTESIZE="$(echo "$X86_64_FREEBSD_JSON" | jq .size -r)"
export X86_64_FREEBSD_SHASUM="$(echo "$X86_64_FREEBSD_JSON" | jq .shasum -r)"
-X86_64_NETBSD_JSON=$(curl --fail "$X86_64_NETBSD_JSON_URL" || exit 1)
-export X86_64_NETBSD_TARBALL="$(echo "$X86_64_NETBSD_JSON" | jq .tarball -r)"
-export X86_64_NETBSD_BYTESIZE="$(echo "$X86_64_NETBSD_JSON" | jq .size -r)"
-export X86_64_NETBSD_SHASUM="$(echo "$X86_64_NETBSD_JSON" | jq .shasum -r)"
+#X86_64_NETBSD_JSON=$(curl --fail "$X86_64_NETBSD_JSON_URL" || exit 1)
+#export X86_64_NETBSD_TARBALL="$(echo "$X86_64_NETBSD_JSON" | jq .tarball -r)"
+#export X86_64_NETBSD_BYTESIZE="$(echo "$X86_64_NETBSD_JSON" | jq .size -r)"
+#export X86_64_NETBSD_SHASUM="$(echo "$X86_64_NETBSD_JSON" | jq .shasum -r)"
export MASTER_DATE="$(date +%Y-%m-%d)"
export MASTER_VERSION="$VERSION"