From 2291bf5bf95c77aa29635cd170530ed825405c0f Mon Sep 17 00:00:00 2001 From: Ilya Shipitsin Date: Sat, 6 Jul 2019 15:56:51 +0500 Subject: [PATCH 1/2] gitlab-ci: build illumos only when runner attached --- .gitlab-ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b835a1d8..38df00fd 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -29,6 +29,8 @@ precise: # illumos gitlab-runner maintained by @hww3 build_illumos: + only: + - master@SoftEther/SoftEtherVPN tags: - illumos script: From c2ad67a90784c39da09808aa55d87b909ef70338 Mon Sep 17 00:00:00 2001 From: Ilya Shipitsin Date: Mon, 8 Jul 2019 12:09:58 +0500 Subject: [PATCH 2/2] Change release packaging Fixes: #846 --- .appveyor.yml | 2 +- .ci/appveyor-create-release-tarball.sh | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) create mode 100755 .ci/appveyor-create-release-tarball.sh diff --git a/.appveyor.yml b/.appveyor.yml index 8de167d6..aea1a568 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -82,7 +82,7 @@ for: only: - image: Ubuntu1804 before_build: - - sh: "if [ ${APPVEYOR_REPO_TAG} == \"true\" ]; then tar --exclude=.git -czf /tmp/${APPVEYOR_REPO_TAG_NAME}.tar.gz . && appveyor PushArtifact /tmp/${APPVEYOR_REPO_TAG_NAME}.tar.gz \nfi" + - sh: "if [ ${APPVEYOR_REPO_TAG} == \"true\" ]; then .ci/appveyor-create-release-tarball.sh\nfi" - ./configure build_script: - make package -C tmp -j $(nproc || sysctl -n hw.ncpu || echo 4) diff --git a/.ci/appveyor-create-release-tarball.sh b/.ci/appveyor-create-release-tarball.sh new file mode 100755 index 00000000..e335f120 --- /dev/null +++ b/.ci/appveyor-create-release-tarball.sh @@ -0,0 +1,7 @@ +#!/bin/bash + +set -eux + +tar --exclude=.git --transform "s//SoftEtherVPN-${APPVEYOR_REPO_TAG_NAME}\//" -czf /tmp/softether-vpn-src-${APPVEYOR_REPO_TAG_NAME}.tar.gz . +appveyor PushArtifact /tmp/softether-vpn-src-${APPVEYOR_REPO_TAG_NAME}.tar.gz +