authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2020-07-23 23:26:24-07:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2020-07-23 23:26:24-07:00
log56a21b7ec35c3bc41ee7f18fb399452d427cc2b4
tree5b0d12e60a013d13938f840339e46c90582c9937
parentaac6e8c4182b5d70de27b1f325151ac4233ed912

ci: undo the recent changes. maybe upstream fixed it

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

ci/azure/windows_msvc_install+1-5
...@@ -4,11 +4,7 @@ set -x...@@ -4,11 +4,7 @@ set -x
4set -e4set -e
55
6pacman -Su --needed --noconfirm6pacman -Su --needed --noconfirm
7# Uncomment when https://github.com/msys2/MSYS2-packages/issues/2050 is fixed7pacman -S --needed --noconfirm wget p7zip python3-pip tar xz
8#pacman -S --needed --noconfirm wget p7zip python3-pip tar xz
9pacman -S --needed --noconfirm wget p7zip tar xz
10pacman -U --noconfirm http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-python-3.8.4-1-any.pkg.tar.zst
11pacman -U --noconfirm http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-python-pip-20.0.2-1-any.pkg.tar.xz
12pip install s3cmd8pip install s3cmd
13wget -nv "https://ziglang.org/deps/llvm%2bclang%2blld-10.0.0-x86_64-windows-msvc-release-mt.tar.xz"9wget -nv "https://ziglang.org/deps/llvm%2bclang%2blld-10.0.0-x86_64-windows-msvc-release-mt.tar.xz"
14tar xf llvm+clang+lld-10.0.0-x86_64-windows-msvc-release-mt.tar.xz10tar xf llvm+clang+lld-10.0.0-x86_64-windows-msvc-release-mt.tar.xz
ci/azure/windows_upload+1-2
...@@ -17,8 +17,7 @@ if [ "${BUILD_REASON}" != "PullRequest" ]; then...@@ -17,8 +17,7 @@ if [ "${BUILD_REASON}" != "PullRequest" ]; then
17 mv dist "$DIRNAME"17 mv dist "$DIRNAME"
18 7z a "$TARBALL" "$DIRNAME"18 7z a "$TARBALL" "$DIRNAME"
1919
20 cp "$DOWNLOADSECUREFILE_SECUREFILEPATH" "$HOME/.s3cfg"20 mv "$DOWNLOADSECUREFILE_SECUREFILEPATH" "$HOME/.s3cfg"
21 cp "$DOWNLOADSECUREFILE_SECUREFILEPATH" "$HOME/AppData/Roaming/s3cmd.ini"
22 s3cmd put -P --add-header="cache-control: public, max-age=31536000, immutable" "$TARBALL" s3://ziglang.org/builds/21 s3cmd put -P --add-header="cache-control: public, max-age=31536000, immutable" "$TARBALL" s3://ziglang.org/builds/
2322
24 SHASUM=$(sha256sum $TARBALL | cut '-d ' -f1)23 SHASUM=$(sha256sum $TARBALL | cut '-d ' -f1)