Commit 937c02f185

Jakub Konka <kubkon@jakubkonka.com>
2020-07-24 09:11:41
Re-apply temp msys2 python fix
Tweak `windows_upload` script to manually specify the config path to `s3cmd`.
master
1 parent b735324
Changed files (2)
ci
azure
windows_msvc_install
windows_upload
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
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)