From 18bc0a67ebf4f49a5f8ea41d03d9b45e74d5d207 Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Sun, 5 Feb 2017 12:15:02 +0100 Subject: [PATCH] Makefile: added BRANCH variable for winpkg --- Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index ab7e0fcf8..390af80bd 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,6 @@ version=$(shell grep '^Version:' pandoc.cabal | awk '{print $$2;}') pandoc=$(shell find dist -name pandoc -type f -exec ls -t {} \; | head -1) +BRANCH?=master quick: stack install --flag 'pandoc:embed_data_files' --fast --test --test-arguments='-j4' @@ -33,7 +34,7 @@ macospkg: man/pandoc.1 winpkg: pandoc-$(version)-windows.msi pandoc-$(version)-windows.msi: - wget 'https://ci.appveyor.com/api/projects/jgm/pandoc/artifacts/windows/pandoc.msi?branch=master' -O pandoc.msi && \ + wget 'https://ci.appveyor.com/api/projects/jgm/pandoc/artifacts/windows/pandoc.msi?branch=$(BRANCH)' -O pandoc.msi && \ osslsigncode sign -pkcs12 ~/Private/ComodoCodeSigning.exp2017.p12 -in pandoc.msi -i http://johnmacfarlane.net/ -t http://timestamp.comodoca.com/ -out $@ -askpass rm pandoc.msi