| author |  Jakub Konka <kubkon@jakubkonka.com> 2020-07-24 09:11:41+02:00 |
| committer | Jakub Konka <kubkon@jakubkonka.com> 2020-07-24 09:19:51+02:00 |
| log | 937c02f185d66051e4ff01b7b1da9c7cf6c76b70 |
| tree | c41d4a561cd39072ba578f2c25db9a1acb2f6b8e |
| parent | b7353240c79517a4d3dc6f245a8d28b73bd83fd7 |
Re-apply temp msys2 python fix
Tweak `windows_upload` script to manually specify the config path
to `s3cmd`.2 files changed, 9 insertions(+), 3 deletions(-)
ci/azure/windows_msvc_install+7-1
| ... | @@ -4,7 +4,13 @@ set -x | ... | @@ -4,7 +4,13 @@ set -x |
| 4 | set -e | 4 | set -e |
| 5 | 5 | ||
| 6 | pacman -Su --needed --noconfirm | 6 | pacman -Su --needed --noconfirm |
| 7 | pacman -S --needed --noconfirm wget p7zip python3-pip tar xz | 7 | |
| 8 | # Uncomment when https://github.com/msys2/MSYS2-packages/issues/2050 is fixed | ||
| 9 | #pacman -S --needed --noconfirm wget p7zip python3-pip tar xz | ||
| 10 | pacman -S --needed --noconfirm wget p7zip tar xz | ||
| 11 | pacman -U --noconfirm http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-python-3.8.4-1-any.pkg.tar.zst | ||
| 12 | pacman -U --noconfirm http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-python-pip-20.0.2-1-any.pkg.tar.xz | ||
| 13 | |||
| 8 | pip install s3cmd | 14 | pip install s3cmd |
| 9 | wget -nv "https://ziglang.org/deps/llvm%2bclang%2blld-10.0.0-x86_64-windows-msvc-release-mt.tar.xz" | 15 | wget -nv "https://ziglang.org/deps/llvm%2bclang%2blld-10.0.0-x86_64-windows-msvc-release-mt.tar.xz" |
| 10 | tar xf llvm+clang+lld-10.0.0-x86_64-windows-msvc-release-mt.tar.xz | 16 | tar xf llvm+clang+lld-10.0.0-x86_64-windows-msvc-release-mt.tar.xz |
ci/azure/windows_upload+2-2
| ... | @@ -17,8 +17,8 @@ if [ "${BUILD_REASON}" != "PullRequest" ]; then | ... | @@ -17,8 +17,8 @@ if [ "${BUILD_REASON}" != "PullRequest" ]; then |
| 17 | mv dist "$DIRNAME" | 17 | mv dist "$DIRNAME" |
| 18 | 7z a "$TARBALL" "$DIRNAME" | 18 | 7z a "$TARBALL" "$DIRNAME" |
| 19 | 19 | ||
| 20 | mv "$DOWNLOADSECUREFILE_SECUREFILEPATH" "$HOME/.s3cfg" | 20 | # mv "$DOWNLOADSECUREFILE_SECUREFILEPATH" "$HOME/.s3cfg" |
| 21 | s3cmd put -P --add-header="cache-control: public, max-age=31536000, immutable" "$TARBALL" s3://ziglang.org/builds/ | 21 | s3cmd -c "$DOWNLOADSECUREFILE_SECUREFILEPATH" put -P --add-header="cache-control: public, max-age=31536000, immutable" "$TARBALL" s3://ziglang.org/builds/ |
| 22 | 22 | ||
| 23 | SHASUM=$(sha256sum $TARBALL | cut '-d ' -f1) | 23 | SHASUM=$(sha256sum $TARBALL | cut '-d ' -f1) |
| 24 | BYTESIZE=$(wc -c < $TARBALL) | 24 | BYTESIZE=$(wc -c < $TARBALL) |