From 937c02f185d66051e4ff01b7b1da9c7cf6c76b70 Mon Sep 17 00:00:00 2001 From: Jakub Konka Date: Fri, 24 Jul 2020 09:11:41 +0200 Subject: [PATCH] Re-apply temp msys2 python fix Tweak `windows_upload` script to manually specify the config path to `s3cmd`. --- ci/azure/windows_msvc_install | 8 +++++++- ci/azure/windows_upload | 4 ++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ci/azure/windows_msvc_install b/ci/azure/windows_msvc_install index 8ac5181ca..5ee316468 100644 --- a/ci/azure/windows_msvc_install +++ b/ci/azure/windows_msvc_install @@ -4,7 +4,13 @@ set -x set -e pacman -Su --needed --noconfirm -pacman -S --needed --noconfirm wget p7zip python3-pip tar xz + +# 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 + 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 7ed1b7d1f..78f320f0d 100755 --- a/ci/azure/windows_upload +++ b/ci/azure/windows_upload @@ -17,8 +17,8 @@ if [ "${BUILD_REASON}" != "PullRequest" ]; then mv dist "$DIRNAME" 7z a "$TARBALL" "$DIRNAME" - mv "$DOWNLOADSECUREFILE_SECUREFILEPATH" "$HOME/.s3cfg" - s3cmd put -P --add-header="cache-control: public, max-age=31536000, immutable" "$TARBALL" s3://ziglang.org/builds/ + # mv "$DOWNLOADSECUREFILE_SECUREFILEPATH" "$HOME/.s3cfg" + s3cmd -c "$DOWNLOADSECUREFILE_SECUREFILEPATH" put -P --add-header="cache-control: public, max-age=31536000, immutable" "$TARBALL" s3://ziglang.org/builds/ SHASUM=$(sha256sum $TARBALL | cut '-d ' -f1) BYTESIZE=$(wc -c < $TARBALL)