diff --git a/ci/azure/windows_msvc_install b/ci/azure/windows_msvc_install index 1dd63bab0..8ac5181ca 100644 --- a/ci/azure/windows_msvc_install +++ b/ci/azure/windows_msvc_install @@ -4,11 +4,7 @@ set -x set -e pacman -Su --needed --noconfirm -# Uncomment when https://github.com/msys2/MSYS2-packages/issues/2050 is fixed -#pacman -S --needed --noconfirm wget p7zip python3-pip tar xz -pacman -S --needed --noconfirm wget p7zip tar xz -pacman -U --noconfirm http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-python-3.8.4-1-any.pkg.tar.zst -pacman -U --noconfirm http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-python-pip-20.0.2-1-any.pkg.tar.xz +pacman -S --needed --noconfirm wget p7zip python3-pip tar xz pip install s3cmd wget -nv "https://ziglang.org/deps/llvm%2bclang%2blld-10.0.0-x86_64-windows-msvc-release-mt.tar.xz" tar xf llvm+clang+lld-10.0.0-x86_64-windows-msvc-release-mt.tar.xz diff --git a/ci/azure/windows_upload b/ci/azure/windows_upload index 3abfcbab8..7ed1b7d1f 100755 --- a/ci/azure/windows_upload +++ b/ci/azure/windows_upload @@ -17,8 +17,7 @@ if [ "${BUILD_REASON}" != "PullRequest" ]; then mv dist "$DIRNAME" 7z a "$TARBALL" "$DIRNAME" - cp "$DOWNLOADSECUREFILE_SECUREFILEPATH" "$HOME/.s3cfg" - cp "$DOWNLOADSECUREFILE_SECUREFILEPATH" "$HOME/AppData/Roaming/s3cmd.ini" + mv "$DOWNLOADSECUREFILE_SECUREFILEPATH" "$HOME/.s3cfg" s3cmd put -P --add-header="cache-control: public, max-age=31536000, immutable" "$TARBALL" s3://ziglang.org/builds/ SHASUM=$(sha256sum $TARBALL | cut '-d ' -f1)