diff options
| author | Eduard Braun <eduard.braun2@gmx.de> | 2017-07-24 19:41:12 +0000 |
|---|---|---|
| committer | Eduard Braun <eduard.braun2@gmx.de> | 2017-07-24 20:10:54 +0000 |
| commit | e6f64503b09d71e8d6c08d1956637d4f15a2dbd7 (patch) | |
| tree | f960e5e1a80ad136714bd6d39140c9cb52fb6a58 /buildtools | |
| parent | Add C++ based Gtk::Action for choosing one item out of many. (diff) | |
| download | inkscape-e6f64503b09d71e8d6c08d1956637d4f15a2dbd7.tar.gz inkscape-e6f64503b09d71e8d6c08d1956637d4f15a2dbd7.zip | |
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...
Diffstat (limited to 'buildtools')
| -rw-r--r-- | buildtools/appveyor.sh | 10 |
1 files changed, 6 insertions, 4 deletions
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 |