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.
This commit is contained in:
Andrew Kelley
2021-10-01 16:03:37 -07:00
parent 456d7e5f5f
commit 7350cb2fc7
8 changed files with 16 additions and 29 deletions

View File

@@ -1,8 +0,0 @@
image: netbsd/latest
secrets:
- 51bfddf5-86a6-4e01-8576-358c72a4a0a4
- 512ed797-0927-475a-83fd-bc997792860c
sources:
- https://github.com/ziglang/zig
tasks:
- build: cd zig && ./ci/srht/netbsd_script

View File

@@ -9,7 +9,7 @@ sudo apt-get install -y cmake s3cmd tidy
ZIGDIR="$(pwd)" ZIGDIR="$(pwd)"
ARCH="$(uname -m)" ARCH="$(uname -m)"
TARGET="$ARCH-linux-musl" 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" PREFIX="$HOME/$CACHE_BASENAME"
MCPU="baseline" MCPU="baseline"
JOBS="-j$(nproc)" JOBS="-j$(nproc)"

View File

@@ -10,13 +10,13 @@ ZIGDIR="$(pwd)"
HOST_ARCH="x86_64" HOST_ARCH="x86_64"
HOST_TARGET="$HOST_ARCH-macos-gnu" HOST_TARGET="$HOST_ARCH-macos-gnu"
HOST_MCPU="baseline" 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" HOST_PREFIX="$HOME/$HOST_CACHE_BASENAME"
ARCH="aarch64" ARCH="aarch64"
TARGET="$ARCH-macos-gnu" TARGET="$ARCH-macos-gnu"
MCPU="apple_a14" 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" PREFIX="$HOME/$CACHE_BASENAME"
JOBS="-j2" JOBS="-j2"

View File

@@ -9,7 +9,7 @@ ZIGDIR="$(pwd)"
ARCH="x86_64" ARCH="x86_64"
TARGET="$ARCH-macos-gnu" TARGET="$ARCH-macos-gnu"
MCPU="baseline" 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" PREFIX="$HOME/$CACHE_BASENAME"
JOBS="-j2" JOBS="-j2"

View File

@@ -7,28 +7,28 @@ platform:
steps: steps:
- name: build - name: build
image: ziglang/static-base:llvm13-aarch64-5 image: ziglang/static-base:llvm13-aarch64-1
commands: commands:
- ./ci/drone/linux_script_build - ./ci/drone/linux_script_build
- name: test-1 - name: test-1
depends_on: depends_on:
- build - build
image: ziglang/static-base:llvm13-aarch64-5 image: ziglang/static-base:llvm13-aarch64-1
commands: commands:
- ./ci/drone/linux_script_test 1 - ./ci/drone/linux_script_test 1
- name: test-2 - name: test-2
depends_on: depends_on:
- build - build
image: ziglang/static-base:llvm13-aarch64-5 image: ziglang/static-base:llvm13-aarch64-1
commands: commands:
- ./ci/drone/linux_script_test 2 - ./ci/drone/linux_script_test 2
- name: test-3 - name: test-3
depends_on: depends_on:
- build - build
image: ziglang/static-base:llvm13-aarch64-5 image: ziglang/static-base:llvm13-aarch64-1
commands: commands:
- ./ci/drone/linux_script_test 3 - ./ci/drone/linux_script_test 3
@@ -38,7 +38,7 @@ steps:
- test-1 - test-1
- test-2 - test-2
- test-3 - test-3
image: ziglang/static-base:llvm13-aarch64-5 image: ziglang/static-base:llvm13-aarch64-1
environment: environment:
SRHT_OAUTH_TOKEN: SRHT_OAUTH_TOKEN:
from_secret: SRHT_OAUTH_TOKEN from_secret: SRHT_OAUTH_TOKEN

View File

@@ -7,7 +7,7 @@ sudo pkg update -fq
sudo pkg install -y cmake py38-s3cmd wget curl jq samurai sudo pkg install -y cmake py38-s3cmd wget curl jq samurai
ZIGDIR="$(pwd)" 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" PREFIX="$HOME/$CACHE_BASENAME"
cd $HOME cd $HOME

View File

@@ -14,11 +14,6 @@
"shasum": "{{X86_64_FREEBSD_SHASUM}}", "shasum": "{{X86_64_FREEBSD_SHASUM}}",
"size": "{{X86_64_FREEBSD_BYTESIZE}}" "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": { "x86_64-macos": {
"tarball": "https://ziglang.org/builds/{{X86_64_MACOS_TARBALL}}", "tarball": "https://ziglang.org/builds/{{X86_64_MACOS_TARBALL}}",
"shasum": "{{X86_64_MACOS_SHASUM}}", "shasum": "{{X86_64_MACOS_SHASUM}}",

View File

@@ -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" 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_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_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 # 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. # 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 "$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_MACOS_JSON_URL" >/dev/null || exit 0
curl --fail -I "$X86_64_FREEBSD_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: # Without --user, this gave me:
# ERROR: Could not install packages due to an EnvironmentError: [Errno 13] Permission denied # 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_BYTESIZE="$(echo "$X86_64_FREEBSD_JSON" | jq .size -r)"
export X86_64_FREEBSD_SHASUM="$(echo "$X86_64_FREEBSD_JSON" | jq .shasum -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) #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_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_BYTESIZE="$(echo "$X86_64_NETBSD_JSON" | jq .size -r)"
export X86_64_NETBSD_SHASUM="$(echo "$X86_64_NETBSD_JSON" | jq .shasum -r)" #export X86_64_NETBSD_SHASUM="$(echo "$X86_64_NETBSD_JSON" | jq .shasum -r)"
export MASTER_DATE="$(date +%Y-%m-%d)" export MASTER_DATE="$(date +%Y-%m-%d)"
export MASTER_VERSION="$VERSION" export MASTER_VERSION="$VERSION"