From 06b595b6eeb17dee8299f409fe0055abdcd2dbee Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kittywhiskers@users.noreply.github.com>
Date: Mon, 13 Dec 2021 12:31:14 +0530
Subject: [PATCH] build: relocate dash-specific CI scripts to its own directory

---
 .gitlab-ci.yml                         |  8 ++++----
 .travis.yml                            | 14 +++++++-------
 ci/{ => dash}/build_depends.sh         |  2 +-
 ci/{ => dash}/build_src.sh             |  2 +-
 ci/{ => dash}/matrix.sh                |  0
 ci/{ => dash}/test_integrationtests.sh |  2 +-
 ci/{ => dash}/test_unittests.sh        |  2 +-
 7 files changed, 15 insertions(+), 15 deletions(-)
 rename ci/{ => dash}/build_depends.sh (96%)
 rename ci/{ => dash}/build_src.sh (98%)
 rename ci/{ => dash}/matrix.sh (100%)
 rename ci/{ => dash}/test_integrationtests.sh (98%)
 rename ci/{ => dash}/test_unittests.sh (95%)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 64c53bc588..cd3109ff69 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -80,7 +80,7 @@ builder-image:
   before_script:
     - export CACHE_DIR=$CI_PROJECT_DIR/cache
     - echo BUILD_TARGET=$BUILD_TARGET
-    - source ./ci/matrix.sh
+    - source ./ci/dash/matrix.sh
 
     # Setup some environment variables
     - |
@@ -109,8 +109,8 @@ builder-image:
   stage: build
   extends: .base-template
   script:
-    - ./ci/build_src.sh
-    - ./ci/test_unittests.sh # Run unit tests in build stage to avoid creating too many parallel jobs
+    - ./ci/dash/build_src.sh
+    - ./ci/dash/test_unittests.sh # Run unit tests in build stage to avoid creating too many parallel jobs
   cache:
     # Let all branches share the same cache, which is ok because ccache is able to handle it
     key:
@@ -141,7 +141,7 @@ builder-image:
     INTEGRATION_TESTS_ARGS: "--extended --exclude feature_pruning,feature_dbcrash"
   script:
     - echo "INTEGRATION_TESTS_ARGS=${INTEGRATION_TESTS_ARGS}"
-    - ./ci/test_integrationtests.sh $INTEGRATION_TESTS_ARGS
+    - ./ci/dash/test_integrationtests.sh $INTEGRATION_TESTS_ARGS
   after_script:
     - mkdir -p $CI_PROJECT_DIR/testlogs
   artifacts:
diff --git a/.travis.yml b/.travis.yml
index 0160ba0717..e0dd1907c9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -31,20 +31,20 @@ stages:
 builddepends: &builddepends
   stage: build depends
   script:
-    - $DOCKER_RUN_IN_BUILDER ./ci/build_depends.sh
+    - $DOCKER_RUN_IN_BUILDER ./ci/dash/build_depends.sh
 
 buildsrc: &buildsrc
   stage: build src
   script:
-    - $DOCKER_RUN_IN_BUILDER ./ci/build_depends.sh
-    - $DOCKER_RUN_IN_BUILDER ./ci/build_src.sh
+    - $DOCKER_RUN_IN_BUILDER ./ci/dash/build_depends.sh
+    - $DOCKER_RUN_IN_BUILDER ./ci/dash/build_src.sh
 
 runtests: &runtests
   stage: run tests
   script:
-    - $DOCKER_RUN_IN_BUILDER ./ci/build_depends.sh
-    - $DOCKER_RUN_IN_BUILDER ./ci/build_src.sh
-    - $DOCKER_RUN_IN_BUILDER ./ci/test_unittests.sh
+    - $DOCKER_RUN_IN_BUILDER ./ci/dash/build_depends.sh
+    - $DOCKER_RUN_IN_BUILDER ./ci/dash/build_src.sh
+    - $DOCKER_RUN_IN_BUILDER ./ci/dash/test_unittests.sh
     - if [ "$TRAVIS_EVENT_TYPE" = "cron" ]; then extended="--extended --exclude feature_pruning,feature_dbcrash"; fi
     - $DOCKER_RUN_IN_BUILDER ./ci/test_integrationtests.sh --quiet --jobs=3 ${extended}
 
@@ -52,7 +52,7 @@ builddocker: &builddocker
   stage: build docker
   script:
     # no need to run tests again here
-    - if [ "$DOCKER_BUILD" = "true" ]; then $DOCKER_RUN_IN_BUILDER ./ci/build_depends.sh && $DOCKER_RUN_IN_BUILDER ./ci/build_src.sh && BUILD_DIR=build-ci/dashcore-$BUILD_TARGET ./docker/build-docker.sh; fi
+    - if [ "$DOCKER_BUILD" = "true" ]; then $DOCKER_RUN_IN_BUILDER ./ci/dash/build_depends.sh && $DOCKER_RUN_IN_BUILDER ./ci/dash/build_src.sh && BUILD_DIR=build-ci/dashcore-$BUILD_TARGET ./docker/build-docker.sh; fi
 
     - MAKEJOBS=-j3
     - RUN_UNIT_TESTS=true
diff --git a/ci/build_depends.sh b/ci/dash/build_depends.sh
similarity index 96%
rename from ci/build_depends.sh
rename to ci/dash/build_depends.sh
index 1b0f42e5a6..40639bcd12 100755
--- a/ci/build_depends.sh
+++ b/ci/dash/build_depends.sh
@@ -6,7 +6,7 @@ export LC_ALL=C.UTF-8
 
 set -e
 
-source ./ci/matrix.sh
+source ./ci/dash/matrix.sh
 
 unset CC; unset CXX
 unset DISPLAY
diff --git a/ci/build_src.sh b/ci/dash/build_src.sh
similarity index 98%
rename from ci/build_src.sh
rename to ci/dash/build_src.sh
index df1b661257..6af4e52d65 100755
--- a/ci/build_src.sh
+++ b/ci/dash/build_src.sh
@@ -6,7 +6,7 @@ export LC_ALL=C.UTF-8
 
 set -e
 
-source ./ci/matrix.sh
+source ./ci/dash/matrix.sh
 
 unset CC; unset CXX
 unset DISPLAY
diff --git a/ci/matrix.sh b/ci/dash/matrix.sh
similarity index 100%
rename from ci/matrix.sh
rename to ci/dash/matrix.sh
diff --git a/ci/test_integrationtests.sh b/ci/dash/test_integrationtests.sh
similarity index 98%
rename from ci/test_integrationtests.sh
rename to ci/dash/test_integrationtests.sh
index cce3b52aa5..5cd2328495 100755
--- a/ci/test_integrationtests.sh
+++ b/ci/dash/test_integrationtests.sh
@@ -8,7 +8,7 @@ set -e
 
 PASS_ARGS="$*"
 
-source ./ci/matrix.sh
+source ./ci/dash/matrix.sh
 
 if [ "$RUN_INTEGRATIONTESTS" != "true" ]; then
   echo "Skipping integration tests"
diff --git a/ci/test_unittests.sh b/ci/dash/test_unittests.sh
similarity index 95%
rename from ci/test_unittests.sh
rename to ci/dash/test_unittests.sh
index ef711eff64..05f4945613 100755
--- a/ci/test_unittests.sh
+++ b/ci/dash/test_unittests.sh
@@ -6,7 +6,7 @@ export LC_ALL=C.UTF-8
 
 set -e
 
-source ./ci/matrix.sh
+source ./ci/dash/matrix.sh
 
 if [ "$RUN_UNITTESTS" != "true" ]; then
   echo "Skipping unit tests"