From f97a20a9ccbfaf5e50827ab249785f85adcd69d3 Mon Sep 17 00:00:00 2001 From: Ilya Shipitsin Date: Sat, 3 Nov 2018 23:49:22 +0500 Subject: [PATCH 1/2] AppVeyor: only add systemctl log when appropriate --- .appveyor.yml | 4 ---- .ci/appveyor_afterbuild.sh | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index bca79a40..39e0edc3 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -53,8 +53,6 @@ for: - make package -C tmp after_build: - .ci/appveyor_afterbuild.sh - on_failure: - - sudo journalctl -xe --no-pager artifacts: - path: build/*.deb name: Ubuntu @@ -69,8 +67,6 @@ for: - .ci/memory-leak-test.sh after_build: - .ci/appveyor_afterbuild.sh - on_failure: - - sudo journalctl -xe --no-pager artifacts: - path: build/*.deb name: Ubuntu diff --git a/.ci/appveyor_afterbuild.sh b/.ci/appveyor_afterbuild.sh index f22759be..1e912a4e 100755 --- a/.ci/appveyor_afterbuild.sh +++ b/.ci/appveyor_afterbuild.sh @@ -8,5 +8,5 @@ sudo dpkg -i build/softether-vpnclient*.deb sudo dpkg -i build/softether-vpncmd*.deb sudo dpkg -i build/softether-vpnserver*.deb -sudo systemctl restart softether-vpnserver +sudo systemctl restart softether-vpnserver || (sudo journalctl -xe --no-pager >> systemctl.log && appveyor PushArtifact systemctl.log && exit 1) From cdc3551ad3387b1917ea20dd2130ed53abcb7062 Mon Sep 17 00:00:00 2001 From: Ilya Shipitsin Date: Sat, 3 Nov 2018 23:51:09 +0500 Subject: [PATCH 2/2] AppVeyor: enable parralel builds --- .appveyor.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 39e0edc3..c16eca49 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -50,7 +50,7 @@ for: before_build: - ./configure build_script: - - make package -C tmp + - make package -C tmp -j $(nproc || sysctl -n hw.ncpu || echo 4) after_build: - .ci/appveyor_afterbuild.sh artifacts: @@ -63,7 +63,7 @@ for: before_build: - ./configure build_script: - - make package -C tmp + - make package -C tmp -j $(nproc || sysctl -n hw.ncpu || echo 4) - .ci/memory-leak-test.sh after_build: - .ci/appveyor_afterbuild.sh