1
0
mirror of https://github.com/SoftEtherVPN/SoftEtherVPN.git synced 2024-11-22 09:29:52 +03:00

Use "build" folder instead of "tmp" in CI scripts

This commit is contained in:
Davide Beatrici 2020-07-20 20:33:36 +02:00
parent 369a8850c4
commit 3c2f5a41ba
7 changed files with 11 additions and 11 deletions

View File

@ -70,7 +70,7 @@ for:
before_build: before_build:
- ./configure - ./configure
build_script: build_script:
- make package -C tmp -j $(nproc || sysctl -n hw.ncpu || echo 4) - make package -C build -j $(nproc || sysctl -n hw.ncpu || echo 4)
test_script: test_script:
- .ci/appveyor-deb-install-test.sh - .ci/appveyor-deb-install-test.sh
- sudo apt-get update && sudo apt-get -y install autoconf libtool liblzo2-dev libpam-dev fping unzip # openvpn build deps - sudo apt-get update && sudo apt-get -y install autoconf libtool liblzo2-dev libpam-dev fping unzip # openvpn build deps
@ -85,7 +85,7 @@ for:
- sh: "if [ ${APPVEYOR_REPO_TAG} == \"true\" ]; then .ci/appveyor-create-release-tarball.sh\nfi" - sh: "if [ ${APPVEYOR_REPO_TAG} == \"true\" ]; then .ci/appveyor-create-release-tarball.sh\nfi"
- ./configure - ./configure
build_script: build_script:
- make package -C tmp -j $(nproc || sysctl -n hw.ncpu || echo 4) - make package -C build -j $(nproc || sysctl -n hw.ncpu || echo 4)
- .ci/memory-leak-test.sh - .ci/memory-leak-test.sh
test_script: test_script:
- .ci/appveyor-deb-install-test.sh - .ci/appveyor-deb-install-test.sh

View File

@ -11,7 +11,7 @@ jobs:
- script: | - script: |
sudo apt -y install cmake gcc g++ libncurses5-dev libreadline-dev libssl-dev make zlib1g-dev sudo apt -y install cmake gcc g++ libncurses5-dev libreadline-dev libssl-dev make zlib1g-dev
./configure ./configure
make package -C tmp -j $(nproc || sysctl -n hw.ncpu || echo 4) make package -C build -j $(nproc || sysctl -n hw.ncpu || echo 4)
.ci/appveyor-deb-install-test.sh .ci/appveyor-deb-install-test.sh
sudo apt-get -y install autoconf libtool liblzo2-dev libpam-dev fping unzip # openvpn build deps sudo apt-get -y install autoconf libtool liblzo2-dev libpam-dev fping unzip # openvpn build deps
sudo .ci/start-se-openvpn.sh sudo .ci/start-se-openvpn.sh

View File

@ -11,7 +11,7 @@ jobs:
configure configure
- script: | - script: |
call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvars64.bat" call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
cd tmp cd build
nmake nmake
- powershell: | - powershell: |
. .ci\appveyor-vpntest.ps1 . .ci\appveyor-vpntest.ps1

View File

@ -5,7 +5,7 @@ RUN_SONARCLOUD="${RUN_SONARCLOUD:-0}"
if [ "${RUN_SONARCLOUD}" = "1" ] && [ ! -z ${SONAR_TOKEN+x} ]; then if [ "${RUN_SONARCLOUD}" = "1" ] && [ ! -z ${SONAR_TOKEN+x} ]; then
./configure ./configure
build-wrapper-linux-x86-64 --out-dir bw-output make -C tmp build-wrapper-linux-x86-64 --out-dir bw-output make -C build
sonar-scanner -Dsonar.projectKey=SoftEtherVPN_SoftEtherVPN -Dsonar.organization=softethervpn -Dsonar.sources=. -Dsonar.cfamily.build-wrapper-output=bw-output -Dsonar.host.url=https://sonarcloud.io -Dsonar.login=${SONAR_TOKEN} sonar-scanner -Dsonar.projectKey=SoftEtherVPN_SoftEtherVPN -Dsonar.organization=softethervpn -Dsonar.sources=. -Dsonar.cfamily.build-wrapper-output=bw-output -Dsonar.host.url=https://sonarcloud.io -Dsonar.login=${SONAR_TOKEN}
else else
echo "Skipping sonar-scan because \$RUN_SONARCLOUD != \"1\" or \$SONAR_TOKEN is not set" echo "Skipping sonar-scan because \$RUN_SONARCLOUD != \"1\" or \$SONAR_TOKEN is not set"

View File

@ -18,7 +18,7 @@ FreeBSD_task:
configure_script: configure_script:
- ./configure - ./configure
build_script: build_script:
- make -j $(sysctl -n hw.ncpu || echo 4) -C tmp - make -j $(sysctl -n hw.ncpu || echo 4) -C build
test_script: test_script:
- ldd build/vpnserver - ldd build/vpnserver
- .ci/memory-leak-test.sh - .ci/memory-leak-test.sh

View File

@ -15,7 +15,7 @@
- cd "$REPOSITORY" && git submodule update --init --recursive - cd "$REPOSITORY" && git submodule update --init --recursive
script: script:
- ./configure - ./configure
- make package -C tmp - make package -C build
- dpkg -i build/softether-vpn*.deb - dpkg -i build/softether-vpn*.deb
- .ci/memory-leak-test.sh - .ci/memory-leak-test.sh
@ -36,7 +36,7 @@ build_illumos:
script: script:
- git submodule init && git submodule update - git submodule init && git submodule update
- CMAKE_FLAGS="-DCMAKE_PREFIX_PATH=/opt/local -DCMAKE_CXX_FLAGS=-m64 -DCMAKE_C_FLAGS=-m64" ./configure - CMAKE_FLAGS="-DCMAKE_PREFIX_PATH=/opt/local -DCMAKE_CXX_FLAGS=-m64 -DCMAKE_C_FLAGS=-m64" ./configure
- gmake -C tmp - gmake -C build
# #
# flawfinder # flawfinder

View File

@ -55,7 +55,7 @@ matrix:
- true - true
script: script:
- ./configure - ./configure
- make -C tmp - make -C build
- otool -L build/vpnserver - otool -L build/vpnserver
- .ci/memory-leak-test.sh - .ci/memory-leak-test.sh
@ -76,7 +76,7 @@ script:
- .ci/coverity.sh - .ci/coverity.sh
- .ci/sonarcloud.sh - .ci/sonarcloud.sh
- ./configure - ./configure
- make -j $(nproc || sysctl -n hw.ncpu || echo 4) -C tmp - make -j $(nproc || sysctl -n hw.ncpu || echo 4) -C build
- ldd build/vpnserver - ldd build/vpnserver
- if [ "${BUILD_DEB}" = "1" ]; then make package -C tmp; fi - if [ "${BUILD_DEB}" = "1" ]; then make package -C build; fi
- .ci/memory-leak-test.sh - .ci/memory-leak-test.sh