luciano/d2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ci/release/build.sh: Update for bash on windows

Browse source
This commit is contained in:
Anmol Sethi 2022-12-18 21:57:06 -08:00
parent e744cd80d8
commit 59f542d675
No known key found for this signature in database
GPG key ID: 25BC68888A99A8BA
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
ci/release/build.sh
View file

@ -260,21 +260,21 @@ build_windows_msi() {
REMOTE_HOST=$CI_D2_WINDOWS_AMD64 REMOTE_HOST=$CI_D2_WINDOWS_AMD64
ln -sf "../build/$VERSION/windows-amd64/d2-$VERSION/bin/d2.exe" ./ci/release/windows/d2.exe ln -sf "../build/$VERSION/windows-amd64/d2-$VERSION/bin/d2.exe" ./ci/release/windows/d2.exe
sh_c rsync --archive --human-readable --copy-links --delete ./ci/release/windows/ "'$REMOTE_HOST:windows\'" sh_c rsync --archive --human-readable --copy-links --delete ./ci/release/windows/ "'$REMOTE_HOST:windows/'"
if ! echo "$VERSION" | grep '[0-9]\.[0-9].[0-9]'; then if ! echo "$VERSION" | grep '[0-9]\.[0-9]\.[0-9]'; then
WIX_VERSION=0.0.0 WIX_VERSION=0.0.0
else else
WIX_VERSION=$VERSION WIX_VERSION=$VERSION
fi fi
sh_c ssh "$REMOTE_HOST" "'cd .\\windows && wix build -arch x64 -d D2Version=$WIX_VERSION .\d2.wxs'" sh_c ssh "$REMOTE_HOST" "'cd ./windows && wix build -arch x64 -d D2Version=$WIX_VERSION ./d2.wxs'"
# --files-from shouldn't be necessary but for some reason selecting d2.msi directly # --files-from shouldn't be necessary but for some reason selecting d2.msi directly
# makes rsync error with: # makes rsync error with:
# ERROR: rejecting unrequested file-list name: .\\windows\\d2.msi # ERROR: rejecting unrequested file-list name: ./windows/d2.msi
# rsync error: requested action not supported (code 4) at flist.c(1027) [Receiver=3.2.7] # rsync error: requested action not supported (code 4) at flist.c(1027) [Receiver=3.2.7]
rsync_files=$(mktempd)/rsync-files rsync_files=$(mktempd)/rsync-files
echo d2.msi >$rsync_files echo d2.msi >$rsync_files
sh_c rsync --archive --human-readable --files-from "$rsync_files" "'$REMOTE_HOST:windows\\'" "./ci/release/build/$VERSION/d2-$VERSION-$OS-$ARCH.msi" sh_c rsync --archive --human-readable --files-from "$rsync_files" "'$REMOTE_HOST:windows/'" "./ci/release/build/$VERSION/d2-$VERSION-$OS-$ARCH.msi"
} }
main "$@" main "$@"