authorgravatar for git@l4.pmLuna <git@l4.pm> 2021-07-12 14:12:09-03:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2021-07-12 21:44:38-04:00
log3e8394776a920be1a3c68b3e622011bca450b3a7
treec95ffae376bf16f6fa5a609884cc2f360ddbabe0
parent9b79ce1cd302a196bbb49e5fa89657bd840f4066

ci: enable netbsd tarballs

This reverts commit 3063f0a5ed373947badd0af056db310283c76e37.

2 files changed, 11 insertions(+), 7 deletions(-)

ci/srht/index.json+5
...@@ -14,6 +14,11 @@...@@ -14,6 +14,11 @@
14 "shasum": "{{X86_64_FREEBSD_SHASUM}}",14 "shasum": "{{X86_64_FREEBSD_SHASUM}}",
15 "size": "{{X86_64_FREEBSD_BYTESIZE}}"15 "size": "{{X86_64_FREEBSD_BYTESIZE}}"
16 },16 },
17 "x86_64-netbsd": {
18 "tarball": "https://ziglang.org/builds/{{X86_64_NETBSD_TARBALL}}",
19 "shasum": "{{X86_64_NETBSD_SHASUM}}",
20 "size": "{{X86_64_NETBSD_BYTESIZE}}"
21 },
17 "x86_64-macos": {22 "x86_64-macos": {
18 "tarball": "https://ziglang.org/builds/{{X86_64_MACOS_TARBALL}}",23 "tarball": "https://ziglang.org/builds/{{X86_64_MACOS_TARBALL}}",
19 "shasum": "{{X86_64_MACOS_SHASUM}}",24 "shasum": "{{X86_64_MACOS_SHASUM}}",
ci/srht/update_download_page+6-7
...@@ -15,8 +15,7 @@ X86_64_WINDOWS_JSON_URL="https://ziglang.org/builds/x86_64-windows-$VERSION.json...@@ -15,8 +15,7 @@ X86_64_WINDOWS_JSON_URL="https://ziglang.org/builds/x86_64-windows-$VERSION.json
15AARCH64_MACOS_JSON_URL="https://ziglang.org/builds/aarch64-macos-$VERSION.json"15AARCH64_MACOS_JSON_URL="https://ziglang.org/builds/aarch64-macos-$VERSION.json"
16X86_64_MACOS_JSON_URL="https://ziglang.org/builds/x86_64-macos-$VERSION.json"16X86_64_MACOS_JSON_URL="https://ziglang.org/builds/x86_64-macos-$VERSION.json"
17X86_64_FREEBSD_JSON_URL="https://ziglang.org/builds/x86_64-freebsd-$VERSION.json"17X86_64_FREEBSD_JSON_URL="https://ziglang.org/builds/x86_64-freebsd-$VERSION.json"
18# NetBSD is disabled until the CI stops reporting false positives for success.18X86_64_NETBSD_JSON_URL="https://ziglang.org/builds/x86_64-netbsd-$VERSION.json"
19#X86_64_NETBSD_JSON_URL="https://ziglang.org/builds/x86_64-netbsd-$VERSION.json"
2019
21# If any of these fail, it's not really this job failing; rather we have detected20# If any of these fail, it's not really this job failing; rather we have detected
22# that this job will be called again later when other jobs have completed.21# that this job will be called again later when other jobs have completed.
...@@ -26,7 +25,7 @@ curl --fail -I "$X86_64_WINDOWS_JSON_URL" >/dev/null || exit 0...@@ -26,7 +25,7 @@ curl --fail -I "$X86_64_WINDOWS_JSON_URL" >/dev/null || exit 0
26curl --fail -I "$AARCH64_MACOS_JSON_URL" >/dev/null || exit 025curl --fail -I "$AARCH64_MACOS_JSON_URL" >/dev/null || exit 0
27curl --fail -I "$X86_64_MACOS_JSON_URL" >/dev/null || exit 026curl --fail -I "$X86_64_MACOS_JSON_URL" >/dev/null || exit 0
28curl --fail -I "$X86_64_FREEBSD_JSON_URL" >/dev/null || exit 027curl --fail -I "$X86_64_FREEBSD_JSON_URL" >/dev/null || exit 0
29#curl --fail -I "$X86_64_NETBSD_JSON_URL" >/dev/null || exit 028curl --fail -I "$X86_64_NETBSD_JSON_URL" >/dev/null || exit 0
3029
31# Without --user, this gave me:30# Without --user, this gave me:
32# ERROR: Could not install packages due to an EnvironmentError: [Errno 13] Permission denied31# ERROR: Could not install packages due to an EnvironmentError: [Errno 13] Permission denied
...@@ -87,10 +86,10 @@ export X86_64_FREEBSD_TARBALL="$(echo "$X86_64_FREEBSD_JSON" | jq .tarball -r)"...@@ -87,10 +86,10 @@ export X86_64_FREEBSD_TARBALL="$(echo "$X86_64_FREEBSD_JSON" | jq .tarball -r)"
87export X86_64_FREEBSD_BYTESIZE="$(echo "$X86_64_FREEBSD_JSON" | jq .size -r)"86export X86_64_FREEBSD_BYTESIZE="$(echo "$X86_64_FREEBSD_JSON" | jq .size -r)"
88export X86_64_FREEBSD_SHASUM="$(echo "$X86_64_FREEBSD_JSON" | jq .shasum -r)"87export X86_64_FREEBSD_SHASUM="$(echo "$X86_64_FREEBSD_JSON" | jq .shasum -r)"
8988
90#X86_64_NETBSD_JSON=$(curl --fail "$X86_64_NETBSD_JSON_URL" || exit 1)89X86_64_NETBSD_JSON=$(curl --fail "$X86_64_NETBSD_JSON_URL" || exit 1)
91#export X86_64_NETBSD_TARBALL="$(echo "$X86_64_NETBSD_JSON" | jq .tarball -r)"90export X86_64_NETBSD_TARBALL="$(echo "$X86_64_NETBSD_JSON" | jq .tarball -r)"
92#export X86_64_NETBSD_BYTESIZE="$(echo "$X86_64_NETBSD_JSON" | jq .size -r)"91export X86_64_NETBSD_BYTESIZE="$(echo "$X86_64_NETBSD_JSON" | jq .size -r)"
93#export X86_64_NETBSD_SHASUM="$(echo "$X86_64_NETBSD_JSON" | jq .shasum -r)"92export X86_64_NETBSD_SHASUM="$(echo "$X86_64_NETBSD_JSON" | jq .shasum -r)"
9493
95export MASTER_DATE="$(date +%Y-%m-%d)"94export MASTER_DATE="$(date +%Y-%m-%d)"
96export MASTER_VERSION="$VERSION"95export MASTER_VERSION="$VERSION"