aboutsummaryrefslogtreecommitdiff
path: root/.github/workflows
diff options
context:
space:
mode:
authorJohn MacFarlane <jgm@berkeley.edu>2020-01-18 16:01:46 -0800
committerJohn MacFarlane <jgm@berkeley.edu>2020-01-18 16:02:28 -0800
commit5028278569bdc06ced5b8151393e2d12602f1b7e (patch)
tree8355fbd076832ba61cc0f4df454815a0321d057d /.github/workflows
parent6c8ed00e7bba8d77fc10ef26cf40ed5ee56288f6 (diff)
downloadpandoc-5028278569bdc06ced5b8151393e2d12602f1b7e.tar.gz
windows release candidate build: More fixes to get 'light' to work.
Diffstat (limited to '.github/workflows')
-rw-r--r--.github/workflows/release-candidate.yml3
1 files changed, 2 insertions, 1 deletions
diff --git a/.github/workflows/release-candidate.yml b/.github/workflows/release-candidate.yml
index 433f97581..368991c67 100644
--- a/.github/workflows/release-candidate.yml
+++ b/.github/workflows/release-candidate.yml
@@ -68,6 +68,7 @@ jobs:
forfiles /P .\.stack-work\install /M pandoc*.exe /S /C "cmd /C echo @path && echo %%WINDOWS%% && copy @path %%RELEASE%%"
stack exec pandoc -- -s --toc MANUAL.txt -o %RELEASE%\MANUAL.html
stack exec pandoc -- -s COPYING.md -t rtf -o %RELEASE%\COPYING.rtf
+ copy %RELEASE%\COPYING.rtf %WINDOWS%
copy COPYRIGHT %RELEASE%\COPYRIGHT.txt
cd windows
echo Creating msi...
@@ -78,7 +79,7 @@ jobs:
%WIXBIN%\candle -arch ${{ matrix.versions.arch }} -dVERSION=%VERSION% -dBINPATH=%RELEASE% *.wxs -out wixobj\
if %errorlevel% neq 0 exit /b %errorlevel%
echo Running light...
- %WIXBIN%\light -sw1076 -ext WixUIExtension -ext WixUtilExtension -cultures:en-us -loc Pandoc-en-us.wxl -dBINPATH=%RELEASE% -out %WORKDIR%\pandoc-%VERSION%-${{ matrix.versions.osarch }}-UNSIGNED.msi wixobj\*.wixobj
+ %WIXBIN%\light -sw1076 -ext WixUIExtension -ext WixUtilExtension -cultures:en-us -loc Pandoc-en-us.wxl -out %WORKDIR%\pandoc-%VERSION%-${{ matrix.versions.osarch }}-UNSIGNED.msi wixobj\*.wixobj
7z a "pandoc-%VERSION%-${{ matrix.versions.osarch }}.zip" pandoc-%VERSION%
cd ..
mkdir windows-release-candidate