| author |  Andrew Kelley <andrew@ziglang.org> 2019-09-22 19:47:07-04:00 |
| committer | Andrew Kelley <andrew@ziglang.org> 2019-09-22 19:47:07-04:00 |
| log | 55925b6e259b5453b8af29a5365d82378cb1d54b |
| tree | 811de384bc6cdeaa426ebc058823dea9e1bb284d |
| parent | 96affd683a302402d470f9a41b801f2e42639859 |
| signature |  Commit is signed but in an unrecognized format. |
windows CI: fix name collision
Previously the CMAKE_BUILD_TYPE=Release was conflicting with the
"distribution" directory `release`. I renamed this to `dist` so that
it won't conflict with any build types.2 files changed, 7 insertions(+), 8 deletions(-)
ci/azure/windows_script.bat+1-1
| ... | ... | @@ -10,7 +10,7 @@ SET "PATH=%PREVPATH%" |
| 10 | 10 | SET "MSYSTEM=%PREVMSYSTEM%" |
| 11 | 11 | |
| 12 | 12 | SET "ZIGBUILDDIR=%SRCROOT%\build" |
| 13 | SET "ZIGINSTALLDIR=%ZIGBUILDDIR%\Release" | |
| 13 | SET "ZIGINSTALLDIR=%ZIGBUILDDIR%\dist" | |
| 14 | 14 | SET "ZIGPREFIXPATH=%SRCROOT%\llvm+clang-9.0.0-win64-msvc-release" |
| 15 | 15 | |
| 16 | 16 | call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64 |
ci/azure/windows_upload+6-7
| ... | ... | @@ -6,16 +6,15 @@ set -e |
| 6 | 6 | if [ "${BUILD_REASON}" != "PullRequest" ]; then |
| 7 | 7 | cd "$ZIGBUILDDIR" |
| 8 | 8 | |
| 9 | rm release/*.exe | |
| 10 | mv ../LICENSE release/ | |
| 11 | mv ../zig-cache/langref.html release/ | |
| 12 | mv release/bin/zig.exe release/ | |
| 13 | rmdir release/bin | |
| 9 | mv ../LICENSE dist/ | |
| 10 | mv ../zig-cache/langref.html dist/ | |
| 11 | mv dist/bin/zig.exe dist/ | |
| 12 | rmdir dist/bin | |
| 14 | 13 | |
| 15 | VERSION=$(release/zig.exe version) | |
| 14 | VERSION=$(dist/zig.exe version) | |
| 16 | 15 | DIRNAME="zig-windows-x86_64-$VERSION" |
| 17 | 16 | TARBALL="$DIRNAME.zip" |
| 18 | mv release "$DIRNAME" | |
| 17 | mv dist "$DIRNAME" | |
| 19 | 18 | 7z a "$TARBALL" "$DIRNAME" |
| 20 | 19 | |
| 21 | 20 | mv "$DOWNLOADSECUREFILE_SECUREFILEPATH" "$HOME/.s3cfg" |