diff options
| author | Andrew Kelley <andrew@ziglang.org> | 2020-03-07 12:18:41 -0500 |
|---|---|---|
| committer | Andrew Kelley <andrew@ziglang.org> | 2020-03-07 12:18:41 -0500 |
| commit | 96c07674fc2293fa040212ab797c05436dc515b1 (patch) | |
| tree | 67b0bc649f4b4c384259a031269254a90078c0bd /ci | |
| parent | bc75c0de6c8227d1c01b59c0d63f4d012e05496f (diff) | |
| parent | abe7305e169be2047d65f96e6525d3828684f058 (diff) | |
| download | zig-96c07674fc2293fa040212ab797c05436dc515b1.tar.gz zig-96c07674fc2293fa040212ab797c05436dc515b1.zip | |
Merge remote-tracking branch 'origin/master' into llvm10
Diffstat (limited to 'ci')
| -rwxr-xr-x | ci/srht/freebsd_script | 11 | ||||
| -rwxr-xr-x | ci/srht/update_download_page | 15 |
2 files changed, 14 insertions, 12 deletions
diff --git a/ci/srht/freebsd_script b/ci/srht/freebsd_script index 37f78291e5..fb4a5d357e 100755 --- a/ci/srht/freebsd_script +++ b/ci/srht/freebsd_script @@ -3,8 +3,15 @@ set -x set -e -sudo pkg update -f -yes | sudo pkg install cmake py27-s3cmd wget curl jq +# The following line can be removed as soon as FreeBSD fixes +# their packaging glitch. If not fixed by March 15, 2020 +# there is something wrong. Should be fixed much sooner. +# note: this will cause some complaints when running +# pkg commands but let's ignore them. +sudo rm /usr/local/etc/pkg/repos/FreeBSD.conf + +sudo pkg update -fq +sudo pkg install -y cmake py27-s3cmd wget curl jq ZIGDIR="$(pwd)" CACHE_BASENAME="llvm+clang-10.0.0-freebsd-x86_64-release" diff --git a/ci/srht/update_download_page b/ci/srht/update_download_page index cd289713db..1a721bec80 100755 --- a/ci/srht/update_download_page +++ b/ci/srht/update_download_page @@ -21,10 +21,7 @@ curl --fail -I "$AARCH64_LINUX_JSON_URL" >/dev/null || exit 0 curl --fail -I "$X86_64_LINUX_JSON_URL" >/dev/null || exit 0 curl --fail -I "$X86_64_WINDOWS_JSON_URL" >/dev/null || exit 0 curl --fail -I "$X86_64_MACOS_JSON_URL" >/dev/null || exit 0 - -# FreeBSD is dealing with some weird upstream bug right now -# https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=244549 -#curl --fail -I "$X86_64_FREEBSD_JSON_URL" >/dev/null || exit 0 +curl --fail -I "$X86_64_FREEBSD_JSON_URL" >/dev/null || exit 0 # Without --user, this gave me: # 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)" export AARCH64_LINUX_BYTESIZE="$(echo "$AARCH64_LINUX_JSON" | jq .size -r)" export AARCH64_LINUX_SHASUM="$(echo "$AARCH64_LINUX_JSON" | jq .shasum -r)" -# FreeBSD is dealing with some weird upstream bug right now -# https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=244549 -#X86_64_FREEBSD_JSON=$(curl --fail "$X86_64_FREEBSD_JSON_URL" || exit 1) -#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_FREEBSD_JSON=$(curl --fail "$X86_64_FREEBSD_JSON_URL" || exit 1) +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)" git clone https://github.com/ziglang/www.ziglang.org --depth 1 cd www.ziglang.org |