diff --git a/ci/azure/windows_script.bat b/ci/azure/windows_script.bat index f1a69202e030c93fa00bf98445420f61ef045da6..5c44abcbe108ade7f28f843c0c3b28fd8a7451cb 100644 --- a/ci/azure/windows_script.bat +++ b/ci/azure/windows_script.bat @@ -10,7 +10,7 @@ SET "PATH=%PREVPATH%" SET "MSYSTEM=%PREVMSYSTEM%" SET "ZIGBUILDDIR=%SRCROOT%\build" -SET "ZIGINSTALLDIR=%ZIGBUILDDIR%\Release" +SET "ZIGINSTALLDIR=%ZIGBUILDDIR%\dist" SET "ZIGPREFIXPATH=%SRCROOT%\llvm+clang-9.0.0-win64-msvc-release" call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64 diff --git a/ci/azure/windows_upload b/ci/azure/windows_upload index 266d1b57ddba0f52c0b8692d660a5912abaf12aa..d5527fa13aebd1f4f5a56e2efeca6215996bcf50 100755 --- a/ci/azure/windows_upload +++ b/ci/azure/windows_upload @@ -6,16 +6,15 @@ set -e if [ "${BUILD_REASON}" != "PullRequest" ]; then cd "$ZIGBUILDDIR" - rm release/*.exe - mv ../LICENSE release/ - mv ../zig-cache/langref.html release/ - mv release/bin/zig.exe release/ - rmdir release/bin + mv ../LICENSE dist/ + mv ../zig-cache/langref.html dist/ + mv dist/bin/zig.exe dist/ + rmdir dist/bin - VERSION=$(release/zig.exe version) + VERSION=$(dist/zig.exe version) DIRNAME="zig-windows-x86_64-$VERSION" TARBALL="$DIRNAME.zip" - mv release "$DIRNAME" + mv dist "$DIRNAME" 7z a "$TARBALL" "$DIRNAME" mv "$DOWNLOADSECUREFILE_SECUREFILEPATH" "$HOME/.s3cfg"