aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn MacFarlane <jgm@berkeley.edu>2019-11-29 11:50:09 -0800
committerJohn MacFarlane <jgm@berkeley.edu>2019-11-29 11:50:09 -0800
commitee6cf6ad6b37a3b7c694566090d8a4cb5300c6e5 (patch)
treedabb29def68b356dec996bffb6b9ec78d1353d8f
parent67f5d65cd5cd3404db9492bd2e6d38bd92e8625d (diff)
downloadpandoc-ee6cf6ad6b37a3b7c694566090d8a4cb5300c6e5.tar.gz
Add Makefile to windows release-candidate build.
Running 'make' in this directory will do the code signing of the msi.
-rw-r--r--.github/workflows/release-candidate.yml5
-rw-r--r--windows/Makefile5
2 files changed, 8 insertions, 2 deletions
diff --git a/.github/workflows/release-candidate.yml b/.github/workflows/release-candidate.yml
index 9f790452c..90ee9e0fa 100644
--- a/.github/workflows/release-candidate.yml
+++ b/.github/workflows/release-candidate.yml
@@ -77,12 +77,13 @@ jobs:
%WIXBIN%\candle -arch ${{ matrix.versions.arch }} -dVERSION=%VERSION% -dBINPATH=%WORKDIR% *.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 -out %WORKDIR%\pandoc-%VERSION%-${{ matrix.versions.osarch }}.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.exe pandoc-citeproc.exe MANUAL.html COPYING.rtf
cd ..
mkdir windows-release-candidate
- copy windows\pandoc-%VERSION%-${{ matrix.versions.osarch }}.msi windows-release-candidate
+ copy windows\pandoc-%VERSION%-${{ matrix.versions.osarch }}-UNSIGNED.msi windows-release-candidate
copy windows\pandoc-%VERSION%-${{ matrix.versions.osarch }}.zip windows-release-candidate
+ copy windows\Makefile windows-release-candidate
- uses: actions/upload-artifact@master
with:
name: windows-release-candidate
diff --git a/windows/Makefile b/windows/Makefile
new file mode 100644
index 000000000..0a442fbef
--- /dev/null
+++ b/windows/Makefile
@@ -0,0 +1,5 @@
+version?=$(shell grep '^[Vv]ersion:' ../pandoc.cabal | awk '{print $$2;}')
+
+pandoc-$(version)-windows-%.msi: pandoc-windows-%-UNSIGNED.msi
+ osslsigncode sign -pkcs12 $$HOME/Private/SectigoCodeSigning.exp2023.p12 -in $< -i http://johnmacfarlane.net/ -t http://timestamp.comodoca.com/ -out $@ -askpass
+