From e6f64503b09d71e8d6c08d1956637d4f15a2dbd7 Mon Sep 17 00:00:00 2001 From: Eduard Braun Date: Mon, 24 Jul 2017 21:41:12 +0200 Subject: CI/AppVeyor: Use dist-win targets and create installers on tag Use a globbing expression to get WiX location as it's dependent on the version installed. Add note about the .msi installer still not being created properly and wix exiting with an error code (mostly to make CI happy). Somebody should figure this out eventually but the .msi format cost me too many hours of my life already... --- buildtools/appveyor.sh | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'buildtools') diff --git a/buildtools/appveyor.sh b/buildtools/appveyor.sh index aaa1574fa..91ea6bd42 100644 --- a/buildtools/appveyor.sh +++ b/buildtools/appveyor.sh @@ -75,7 +75,9 @@ message "##### BUILD SUCCESSFULL #####\n\n" ### package -BRANCH=$(git branch | tail -n 1 | tr -d ' ') -DATE=$(git log -n 1 --pretty=%cd --date=short) -HASH=$(git rev-parse --short HEAD) -7z a "inkscape-${BRANCH}-(${DATE}_${HASH})-${MSYSTEM_CARCH}.7z" inkscape +if [ "$APPVEYOR_REPO_TAG" = "true" ] +then + ninja dist-win-all +else + ninja dist-win-7z-fast +fi \ No newline at end of file -- cgit v1.2.3