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.master
parent
96affd683a
commit
55925b6e25
|
@ -10,7 +10,7 @@ SET "PATH=%PREVPATH%"
|
||||||
SET "MSYSTEM=%PREVMSYSTEM%"
|
SET "MSYSTEM=%PREVMSYSTEM%"
|
||||||
|
|
||||||
SET "ZIGBUILDDIR=%SRCROOT%\build"
|
SET "ZIGBUILDDIR=%SRCROOT%\build"
|
||||||
SET "ZIGINSTALLDIR=%ZIGBUILDDIR%\Release"
|
SET "ZIGINSTALLDIR=%ZIGBUILDDIR%\dist"
|
||||||
SET "ZIGPREFIXPATH=%SRCROOT%\llvm+clang-9.0.0-win64-msvc-release"
|
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
|
call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64
|
||||||
|
|
|
@ -6,16 +6,15 @@ set -e
|
||||||
if [ "${BUILD_REASON}" != "PullRequest" ]; then
|
if [ "${BUILD_REASON}" != "PullRequest" ]; then
|
||||||
cd "$ZIGBUILDDIR"
|
cd "$ZIGBUILDDIR"
|
||||||
|
|
||||||
rm release/*.exe
|
mv ../LICENSE dist/
|
||||||
mv ../LICENSE release/
|
mv ../zig-cache/langref.html dist/
|
||||||
mv ../zig-cache/langref.html release/
|
mv dist/bin/zig.exe dist/
|
||||||
mv release/bin/zig.exe release/
|
rmdir dist/bin
|
||||||
rmdir release/bin
|
|
||||||
|
|
||||||
VERSION=$(release/zig.exe version)
|
VERSION=$(dist/zig.exe version)
|
||||||
DIRNAME="zig-windows-x86_64-$VERSION"
|
DIRNAME="zig-windows-x86_64-$VERSION"
|
||||||
TARBALL="$DIRNAME.zip"
|
TARBALL="$DIRNAME.zip"
|
||||||
mv release "$DIRNAME"
|
mv dist "$DIRNAME"
|
||||||
7z a "$TARBALL" "$DIRNAME"
|
7z a "$TARBALL" "$DIRNAME"
|
||||||
|
|
||||||
mv "$DOWNLOADSECUREFILE_SECUREFILEPATH" "$HOME/.s3cfg"
|
mv "$DOWNLOADSECUREFILE_SECUREFILEPATH" "$HOME/.s3cfg"
|
||||||
|
|
Loading…
Reference in New Issue