Skip to content

Commit 3e83947

Browse files
lun-4andrewrk
authored andcommitted
ci: enable netbsd tarballs
This reverts commit 3063f0a.
1 parent 9b79ce1 commit 3e83947

File tree

2 files changed

+11
-7
lines changed

2 files changed

+11
-7
lines changed

ci/srht/index.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,11 @@
1414
"shasum": "{{X86_64_FREEBSD_SHASUM}}",
1515
"size": "{{X86_64_FREEBSD_BYTESIZE}}"
1616
},
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+
},
1722
"x86_64-macos": {
1823
"tarball": "https://ziglang.org/builds/{{X86_64_MACOS_TARBALL}}",
1924
"shasum": "{{X86_64_MACOS_SHASUM}}",

ci/srht/update_download_page

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,7 @@ X86_64_WINDOWS_JSON_URL="https://ziglang.org/builds/x86_64-windows-$VERSION.json
1515
AARCH64_MACOS_JSON_URL="https://ziglang.org/builds/aarch64-macos-$VERSION.json"
1616
X86_64_MACOS_JSON_URL="https://ziglang.org/builds/x86_64-macos-$VERSION.json"
1717
X86_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.
19-
#X86_64_NETBSD_JSON_URL="https://ziglang.org/builds/x86_64-netbsd-$VERSION.json"
18+
X86_64_NETBSD_JSON_URL="https://ziglang.org/builds/x86_64-netbsd-$VERSION.json"
2019

2120
# If any of these fail, it's not really this job failing; rather we have detected
2221
# 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
2625
curl --fail -I "$AARCH64_MACOS_JSON_URL" >/dev/null || exit 0
2726
curl --fail -I "$X86_64_MACOS_JSON_URL" >/dev/null || exit 0
2827
curl --fail -I "$X86_64_FREEBSD_JSON_URL" >/dev/null || exit 0
29-
#curl --fail -I "$X86_64_NETBSD_JSON_URL" >/dev/null || exit 0
28+
curl --fail -I "$X86_64_NETBSD_JSON_URL" >/dev/null || exit 0
3029

3130
# Without --user, this gave me:
3231
# 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)"
8786
export X86_64_FREEBSD_BYTESIZE="$(echo "$X86_64_FREEBSD_JSON" | jq .size -r)"
8887
export 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)
91-
#export 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)"
93-
#export X86_64_NETBSD_SHASUM="$(echo "$X86_64_NETBSD_JSON" | jq .shasum -r)"
89+
X86_64_NETBSD_JSON=$(curl --fail "$X86_64_NETBSD_JSON_URL" || exit 1)
90+
export X86_64_NETBSD_TARBALL="$(echo "$X86_64_NETBSD_JSON" | jq .tarball -r)"
91+
export X86_64_NETBSD_BYTESIZE="$(echo "$X86_64_NETBSD_JSON" | jq .size -r)"
92+
export X86_64_NETBSD_SHASUM="$(echo "$X86_64_NETBSD_JSON" | jq .shasum -r)"
9493

9594
export MASTER_DATE="$(date +%Y-%m-%d)"
9695
export MASTER_VERSION="$VERSION"

0 commit comments

Comments
 (0)