From 3e8394776a920be1a3c68b3e622011bca450b3a7 Mon Sep 17 00:00:00 2001 From: Luna Date: Mon, 12 Jul 2021 14:12:09 -0300 Subject: [PATCH] ci: enable netbsd tarballs This reverts commit 3063f0a5ed373947badd0af056db310283c76e37. --- ci/srht/index.json | 5 +++++ ci/srht/update_download_page | 13 ++++++------- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/ci/srht/index.json b/ci/srht/index.json index 5c5b8ab88263cc81b72fcae27bf9414df1355a27..32eb103d170071c343b7d10c3d2a5a666c6ef419 100644 --- a/ci/srht/index.json +++ b/ci/srht/index.json @@ -14,6 +14,11 @@ "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 b1cdbd4305e48b407b6ec109b3a4c1aedce6b4e6..490388ca78e27cd8ab1364e91a8b846ffb01fbfb 100755 --- a/ci/srht/update_download_page +++ b/ci/srht/update_download_page @@ -15,8 +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" -# NetBSD is disabled until the CI stops reporting false positives for success. -#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. @@ -26,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 @@ -87,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" -- 2.54.0