From 3c2f5a41bacc7f8b0611d39128279d8e3e0c2730 Mon Sep 17 00:00:00 2001
From: Davide Beatrici <git@davidebeatrici.dev>
Date: Mon, 20 Jul 2020 20:33:36 +0200
Subject: [PATCH] Use "build" folder instead of "tmp" in CI scripts

---
 .appveyor.yml                 | 4 ++--
 .ci/azure-pipelines-linux.yml | 2 +-
 .ci/azure-pipelines-win.yml   | 2 +-
 .ci/sonarcloud.sh             | 2 +-
 .cirrus.yml                   | 2 +-
 .gitlab-ci.yml                | 4 ++--
 .travis.yml                   | 6 +++---
 7 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index aea1a568..55dd6f29 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -70,7 +70,7 @@ for:
   before_build:
     - ./configure
   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:
     - .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
@@ -85,7 +85,7 @@ for:
     - 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)
+    - make package -C build -j $(nproc || sysctl -n hw.ncpu || echo 4)
     - .ci/memory-leak-test.sh
   test_script:
     - .ci/appveyor-deb-install-test.sh
diff --git a/.ci/azure-pipelines-linux.yml b/.ci/azure-pipelines-linux.yml
index 85f9c807..39ca2bfa 100644
--- a/.ci/azure-pipelines-linux.yml
+++ b/.ci/azure-pipelines-linux.yml
@@ -11,7 +11,7 @@ jobs:
   - script: |
       sudo apt -y install cmake gcc g++ libncurses5-dev libreadline-dev libssl-dev make zlib1g-dev
       ./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
       sudo apt-get -y install autoconf libtool liblzo2-dev libpam-dev fping unzip # openvpn build deps
       sudo .ci/start-se-openvpn.sh
diff --git a/.ci/azure-pipelines-win.yml b/.ci/azure-pipelines-win.yml
index b08db741..1ef05eb7 100644
--- a/.ci/azure-pipelines-win.yml
+++ b/.ci/azure-pipelines-win.yml
@@ -11,7 +11,7 @@ jobs:
       configure
   - script: |
      call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
-      cd tmp
+      cd build
       nmake
   - powershell: |
      . .ci\appveyor-vpntest.ps1
diff --git a/.ci/sonarcloud.sh b/.ci/sonarcloud.sh
index fe4c673b..f9ea3561 100755
--- a/.ci/sonarcloud.sh
+++ b/.ci/sonarcloud.sh
@@ -5,7 +5,7 @@ RUN_SONARCLOUD="${RUN_SONARCLOUD:-0}"
 
 if [ "${RUN_SONARCLOUD}" = "1" ] && [ ! -z ${SONAR_TOKEN+x} ]; then
    ./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}
 else
     echo "Skipping sonar-scan because \$RUN_SONARCLOUD != \"1\" or \$SONAR_TOKEN is not set"
diff --git a/.cirrus.yml b/.cirrus.yml
index dcdcc52f..5172b1f4 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -18,7 +18,7 @@ FreeBSD_task:
   configure_script:
     - ./configure
   build_script:
-    - make -j $(sysctl -n hw.ncpu || echo 4) -C tmp
+    - make -j $(sysctl -n hw.ncpu || echo 4) -C build
   test_script:
     - ldd build/vpnserver
     - .ci/memory-leak-test.sh
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 38df00fd..92f5893e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -15,7 +15,7 @@
     - cd "$REPOSITORY" && git submodule update --init --recursive
   script:
     - ./configure
-    - make package -C tmp
+    - make package -C build
     - dpkg -i build/softether-vpn*.deb
     - .ci/memory-leak-test.sh
 
@@ -36,7 +36,7 @@ build_illumos:
   script:
     - git submodule init && git submodule update
     - CMAKE_FLAGS="-DCMAKE_PREFIX_PATH=/opt/local -DCMAKE_CXX_FLAGS=-m64 -DCMAKE_C_FLAGS=-m64" ./configure
-    - gmake -C tmp
+    - gmake -C build
 
 #
 # flawfinder
diff --git a/.travis.yml b/.travis.yml
index 5f72094c..0028e1df 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -55,7 +55,7 @@ matrix:
         - true
       script:
         - ./configure
-        - make -C tmp
+        - make -C build
         - otool -L build/vpnserver
         - .ci/memory-leak-test.sh
 
@@ -76,7 +76,7 @@ script:
   - .ci/coverity.sh
   - .ci/sonarcloud.sh
   - ./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
-  - 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