From 657285e593dc1b901203bd797c335e87672e3d26 Mon Sep 17 00:00:00 2001 From: Eduard Braun Date: Tue, 13 Jun 2017 19:43:11 +0200 Subject: Skip full system upgrade Speeds up the build by a few minutes. most packages are not needed anyway, and those that are should be updated by msys2installdeps.sh --- appveyor.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/appveyor.sh b/appveyor.sh index 26d75571a..dbf13ac32 100644 --- a/appveyor.sh +++ b/appveyor.sh @@ -16,8 +16,7 @@ EOF -# update/install dependecies -pacman -Suu --needed --noconfirm --noprogressbar +# install dependecies pacman -S $MINGW_PACKAGE_PREFIX-ccache --needed --noconfirm --noprogressbar source ../msys2installdeps.sh -- cgit v1.2.3 From 50eccc679cc3836dab9cbe14a59d6b3d3ba2fe0a Mon Sep 17 00:00:00 2001 From: Eduard Braun Date: Tue, 13 Jun 2017 19:44:26 +0200 Subject: Build all branches by default (no reason not to and doesn't hurt as long as the UI setting to "Skip branches without appveyor.yml" is enabled) --- appveyor.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index dd484b49e..32c282413 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,9 +1,5 @@ version: '{branch}-{build}' -branches: - only: - - master - clone_depth: 10 environment: -- cgit v1.2.3 From 1effb4af207ae12e9823c2b899e8a2a774f0c077 Mon Sep 17 00:00:00 2001 From: Eduard Braun Date: Tue, 13 Jun 2017 23:52:01 +0200 Subject: actually fail if there is an error (this is necessary as we're running an additional bash inside the CI environment and are never generating any exit codes on the actual console) --- appveyor.sh | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/appveyor.sh b/appveyor.sh index dbf13ac32..cf0f08942 100644 --- a/appveyor.sh +++ b/appveyor.sh @@ -16,22 +16,24 @@ EOF -# install dependecies +# install dependencies pacman -S $MINGW_PACKAGE_PREFIX-ccache --needed --noconfirm --noprogressbar source ../msys2installdeps.sh # configure ccache --max-size=200M -cmake .. -G Ninja -DCMAKE_C_COMPILER_LAUNCHER="ccache" -DCMAKE_CXX_COMPILER_LAUNCHER="ccache" +cmake .. -G Ninja -DCMAKE_C_COMPILER_LAUNCHER="ccache" -DCMAKE_CXX_COMPILER_LAUNCHER="ccache" || exit 1 # build ccache --zero-stats -ninja +ninja || exit 1 ccache --show-stats -ninja install + +# install +ninja install || exit 1 # test -inkscape/inkscape.exe -V +inkscape/inkscape.exe -V || exit 1 # package 7z a inkscape.7z inkscape -- cgit v1.2.3 From a99be70b9e00c851f51f34dd840e8c25d2c4ffda Mon Sep 17 00:00:00 2001 From: Eduard Braun Date: Wed, 14 Jun 2017 00:26:44 +0200 Subject: suppress noise from install target --- appveyor.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/appveyor.sh b/appveyor.sh index cf0f08942..dfed25668 100644 --- a/appveyor.sh +++ b/appveyor.sh @@ -22,7 +22,11 @@ source ../msys2installdeps.sh # configure ccache --max-size=200M -cmake .. -G Ninja -DCMAKE_C_COMPILER_LAUNCHER="ccache" -DCMAKE_CXX_COMPILER_LAUNCHER="ccache" || exit 1 +cmake .. -G Ninja \ + -DCMAKE_C_COMPILER_LAUNCHER="ccache" \ + -DCMAKE_CXX_COMPILER_LAUNCHER="ccache" \ + -DCMAKE_INSTALL_MESSAGE="NEVER" \ + || exit 1 # build ccache --zero-stats -- cgit v1.2.3 From ca3530676c5b5cdb44124e163642647bc40a2c7d Mon Sep 17 00:00:00 2001 From: Eduard Braun Date: Wed, 14 Jun 2017 20:31:41 +0200 Subject: output some status messages --- appveyor.sh | 43 +++++++++++++++++++++++++++++++------------ 1 file changed, 31 insertions(+), 12 deletions(-) diff --git a/appveyor.sh b/appveyor.sh index dfed25668..6ea09e1b9 100644 --- a/appveyor.sh +++ b/appveyor.sh @@ -1,12 +1,19 @@ #!/usr/bin/env bash +### functions +message() { echo -e "\e[1;32m\n${1}\n\e[0m"; } +error() { echo -e "\e[1;31m\nError: ${1}\n\e[0m"; exit 1; } + + + +### setup + +# do everything in /build cd "$(dirname "$0")" mkdir build cd build - - -# Write an empty fonts.conf to speed up fc-cache +# write an empty fonts.conf to speed up fc-cache export FONTCONFIG_FILE=/dummy-fonts.conf cat >"$FONTCONFIG_FILE" < @@ -14,30 +21,42 @@ cat >"$FONTCONFIG_FILE" < EOF - - # install dependencies -pacman -S $MINGW_PACKAGE_PREFIX-ccache --needed --noconfirm --noprogressbar +message "--- Installing dependencies" source ../msys2installdeps.sh +pacman -S $MINGW_PACKAGE_PREFIX-ccache --needed --noconfirm --noprogressbar +ccache --max-size=200M + + + +### build / test + +message "\n\n##### STARTING BUILD #####" # configure -ccache --max-size=200M +message "--- Configuring the build" cmake .. -G Ninja \ -DCMAKE_C_COMPILER_LAUNCHER="ccache" \ -DCMAKE_CXX_COMPILER_LAUNCHER="ccache" \ -DCMAKE_INSTALL_MESSAGE="NEVER" \ - || exit 1 + || error "cmake failed" # build +message "--- Compiling Inkscape" ccache --zero-stats -ninja || exit 1 +ninja || error "compilation failed" ccache --show-stats # install -ninja install || exit 1 +message "--- Installing the project" +ninja install || error "installation failed" # test -inkscape/inkscape.exe -V || exit 1 +message "--- Running tests" +inkscape/inkscape.exe -V || error "tests failed" + +message "##### BUILD SUCCESSFULL #####\n\n" + -# package +### package 7z a inkscape.7z inkscape -- cgit v1.2.3 From c843ec6547e4474b09f5a30c0537646e0196c713 Mon Sep 17 00:00:00 2001 From: Eduard Braun Date: Wed, 14 Jun 2017 22:48:13 +0200 Subject: disable unused build stage --- appveyor.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/appveyor.yml b/appveyor.yml index 32c282413..4bf250aed 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -16,3 +16,5 @@ artifacts: cache: - C:\msys64\home\appveyor\.ccache + +test: off -- cgit v1.2.3 From 2e1e4ac91785491c4b730316bbcbe889759595c5 Mon Sep 17 00:00:00 2001 From: Eduard Braun Date: Fri, 16 Jun 2017 18:59:48 +0200 Subject: Install updated versions of libgc (https://github.com/Alexpux/MINGW-packages/pull/2597) and gtest (https://github.com/Alexpux/MINGW-packages/pull/2588) - libgc 7.6.0 solves a deadlocking issue that prevented tests to ever complete (it might also be related to https://bugs.launchpad.net/inkscape/+bug/1659172 and https://bugs.launchpad.net/inkscape/+bug/1655619) - gtest 1.8.0 includes gmock making it unnecessary to download and build separately --- appveyor.sh | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/appveyor.sh b/appveyor.sh index 6ea09e1b9..6e68af0c8 100644 --- a/appveyor.sh +++ b/appveyor.sh @@ -27,6 +27,14 @@ source ../msys2installdeps.sh pacman -S $MINGW_PACKAGE_PREFIX-ccache --needed --noconfirm --noprogressbar ccache --max-size=200M +# pending package updates, see +# - https://github.com/Alexpux/MINGW-packages/pull/2597 +# - https://github.com/Alexpux/MINGW-packages/pull/2588 +wget -nv https://gitlab.com/Ede123/bintray/raw/master/$MINGW_PACKAGE_PREFIX-gc-7.6.0-1-any.pkg.tar.xz \ + && pacman -U $MINGW_PACKAGE_PREFIX-gc-7.6.0-1-any.pkg.tar.xz --noconfirm +wget -nv https://gitlab.com/Ede123/bintray/raw/master/$MINGW_PACKAGE_PREFIX-gtest-1.8.0-1-any.pkg.tar.xz \ + && pacman -U $MINGW_PACKAGE_PREFIX-gtest-1.8.0-1-any.pkg.tar.xz --noconfirm + ### build / test -- cgit v1.2.3 From b50883a44aade0d93b3436850964a5e876981a35 Mon Sep 17 00:00:00 2001 From: Eduard Braun Date: Fri, 16 Jun 2017 21:09:46 +0200 Subject: Enable tests (won't fail yet If tests do not complete sucessfully because of frequent SEGFAULTs on exit whose source has yet to be determined) --- appveyor.sh | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/appveyor.sh b/appveyor.sh index 6e68af0c8..8258a49fc 100644 --- a/appveyor.sh +++ b/appveyor.sh @@ -2,7 +2,8 @@ ### functions message() { echo -e "\e[1;32m\n${1}\n\e[0m"; } -error() { echo -e "\e[1;31m\nError: ${1}\n\e[0m"; exit 1; } +warning() { echo -e "\e[1;33m\nWarning: ${1}\n\e[0m"; } +error() { echo -e "\e[1;31m\nError: ${1}\n\e[0m"; exit 1; } @@ -61,7 +62,17 @@ ninja install || error "installation failed" # test message "--- Running tests" -inkscape/inkscape.exe -V || error "tests failed" +# check if the installed executable works +inkscape/inkscape.exe -V || error "installed executable won't run" +PATH= inkscape/inkscape.exe -V >/dev/null || error "installed executable won't run with empty PATH (missing dependecies?)" +err=$(PATH= inkscape/inkscape.exe -V 2>&1 >/dev/null) +if [ -n "$err" ]; then warning "installed executable produces output on stderr:"; echo "$err"; fi +# check if the uninstalled executable works +INKSCAPE_DATADIR=../share bin/inkscape.exe -V >/dev/null || error "uninstalled executable won't run" +err=$(INKSCAPE_DATADIR=../share bin/inkscape.exe -V 2>&1 >/dev/null) +if [ -n "$err" ]; then warning "installed executable produces output on stderr:"; echo "$err"; fi +# run tests (don't fail yet as most tests SEGFAULT on exit) +ninja check || warning "tests failed" message "##### BUILD SUCCESSFULL #####\n\n" -- cgit v1.2.3 From e16da3d55dacb4a9dc846aa2b6f2037799ae1106 Mon Sep 17 00:00:00 2001 From: Eduard Braun Date: Fri, 16 Jun 2017 22:43:10 +0200 Subject: Disable tests - they still deadlock sporadically :-( --- appveyor.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.sh b/appveyor.sh index 8258a49fc..436c5e932 100644 --- a/appveyor.sh +++ b/appveyor.sh @@ -72,7 +72,7 @@ INKSCAPE_DATADIR=../share bin/inkscape.exe -V >/dev/null || error "uninstalled e err=$(INKSCAPE_DATADIR=../share bin/inkscape.exe -V 2>&1 >/dev/null) if [ -n "$err" ]; then warning "installed executable produces output on stderr:"; echo "$err"; fi # run tests (don't fail yet as most tests SEGFAULT on exit) -ninja check || warning "tests failed" +#ninja check || warning "tests failed" # disabled because of sporadic deadlocks :-( message "##### BUILD SUCCESSFULL #####\n\n" -- cgit v1.2.3