authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2020-03-05 23:37:29-05:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2020-03-05 23:37:29-05:00
log6b069f5c8c0f23099287ba340ddf8490c6cdc94d
treea1850abd37ae14de1f478db5d08d22d824aaecd8
parentd31b65e762fbf59d29780d4cbf7be1ab824a67de
signaturelock-open Commit is signed but in an unrecognized format.

Revert "put FreeBSD CI in timeout for misbehavior"

This reverts commit c0c9303bd63468afe146ad729cf963ee06a1777f. Thanks to commit c08444b33ff49981cd0a39cced479e2197dc4fd7 we can now re-enable FreeBSD in the CI.

1 files changed, 5 insertions(+), 10 deletions(-)

ci/srht/update_download_page+5-10
...@@ -21,10 +21,7 @@ curl --fail -I "$AARCH64_LINUX_JSON_URL" >/dev/null || exit 0...@@ -21,10 +21,7 @@ curl --fail -I "$AARCH64_LINUX_JSON_URL" >/dev/null || exit 0
21curl --fail -I "$X86_64_LINUX_JSON_URL" >/dev/null || exit 021curl --fail -I "$X86_64_LINUX_JSON_URL" >/dev/null || exit 0
22curl --fail -I "$X86_64_WINDOWS_JSON_URL" >/dev/null || exit 022curl --fail -I "$X86_64_WINDOWS_JSON_URL" >/dev/null || exit 0
23curl --fail -I "$X86_64_MACOS_JSON_URL" >/dev/null || exit 023curl --fail -I "$X86_64_MACOS_JSON_URL" >/dev/null || exit 0
2424curl --fail -I "$X86_64_FREEBSD_JSON_URL" >/dev/null || exit 0
25# FreeBSD is dealing with some weird upstream bug right now
26# https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=244549
27#curl --fail -I "$X86_64_FREEBSD_JSON_URL" >/dev/null || exit 0
2825
29# Without --user, this gave me:26# Without --user, this gave me:
30# ERROR: Could not install packages due to an EnvironmentError: [Errno 13] Permission denied27# ERROR: Could not install packages due to an EnvironmentError: [Errno 13] Permission denied
...@@ -66,12 +63,10 @@ export AARCH64_LINUX_TARBALL="$(echo "$AARCH64_LINUX_JSON" | jq .tarball -r)"...@@ -66,12 +63,10 @@ export AARCH64_LINUX_TARBALL="$(echo "$AARCH64_LINUX_JSON" | jq .tarball -r)"
66export AARCH64_LINUX_BYTESIZE="$(echo "$AARCH64_LINUX_JSON" | jq .size -r)"63export AARCH64_LINUX_BYTESIZE="$(echo "$AARCH64_LINUX_JSON" | jq .size -r)"
67export AARCH64_LINUX_SHASUM="$(echo "$AARCH64_LINUX_JSON" | jq .shasum -r)"64export AARCH64_LINUX_SHASUM="$(echo "$AARCH64_LINUX_JSON" | jq .shasum -r)"
6865
69# FreeBSD is dealing with some weird upstream bug right now66X86_64_FREEBSD_JSON=$(curl --fail "$X86_64_FREEBSD_JSON_URL" || exit 1)
70# https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=24454967export X86_64_FREEBSD_TARBALL="$(echo "$X86_64_FREEBSD_JSON" | jq .tarball -r)"
71#X86_64_FREEBSD_JSON=$(curl --fail "$X86_64_FREEBSD_JSON_URL" || exit 1)68export X86_64_FREEBSD_BYTESIZE="$(echo "$X86_64_FREEBSD_JSON" | jq .size -r)"
72#export X86_64_FREEBSD_TARBALL="$(echo "$X86_64_FREEBSD_JSON" | jq .tarball -r)"69export X86_64_FREEBSD_SHASUM="$(echo "$X86_64_FREEBSD_JSON" | jq .shasum -r)"
73#export X86_64_FREEBSD_BYTESIZE="$(echo "$X86_64_FREEBSD_JSON" | jq .size -r)"
74#export X86_64_FREEBSD_SHASUM="$(echo "$X86_64_FREEBSD_JSON" | jq .shasum -r)"
7570
76git clone https://github.com/ziglang/www.ziglang.org --depth 171git clone https://github.com/ziglang/www.ziglang.org --depth 1
77cd www.ziglang.org72cd www.ziglang.org