ci: start respecting DEP_OPTS, unify with GitLab

Co-authored-by: UdjinM6 <UdjinM6@users.noreply.github.com>

Author: kwvg

.github/workflows/build-depends.yml

@@ -36,7 +36,12 @@ jobs:
         run: |
           BUILD_TARGET="${{ inputs.build-target }}"
           source ./ci/dash/matrix.sh
-          echo "HOST=${HOST}" >> $GITHUB_OUTPUT
+          echo "DEP_OPTS=${DEP_OPTS}" >> "${GITHUB_OUTPUT}"
+          echo "HOST=${HOST}" >> "${GITHUB_OUTPUT}"
+          DEP_HASH="$(echo -n "${BUILD_TARGET}" "${DEP_OPTS}" "${HOST}" | sha256sum | head -c 64)"
+          echo "\"${BUILD_TARGET}\" has HOST=\"${HOST}\" and DEP_OPTS=\"${DEP_OPTS}\" with hash \"${DEP_HASH}\""
+          echo "DEP_HASH=${DEP_HASH}" >> "${GITHUB_OUTPUT}"
+
         shell: bash
 
       - name: Cache depends sources
@@ -56,13 +61,13 @@ jobs:
           path: |
             depends/built
             depends/${{ steps.setup.outputs.HOST }}
-          key: ${{ runner.os }}-depends-${{ inputs.build-target }}-${{ hashFiles('depends/packages/*') }}
+          key: ${{ runner.os }}-depends-${{ inputs.build-target }}-${{ steps.setup.outputs.DEP_HASH }}-${{ hashFiles('depends/packages/*') }}
           restore-keys: |
             ${{ runner.os }}-depends-${{ inputs.build-target }}-${{ hashFiles('depends/packages/*') }}
             ${{ runner.os }}-depends-${{ inputs.build-target }}
 
       - name: Build depends
-        run: env HOST=${{ steps.setup.outputs.HOST }} make -j$(nproc) -C depends
+        run: env ${{ steps.setup.outputs.DEP_OPTS }} HOST=${{ steps.setup.outputs.HOST }} make -j$(nproc) -C depends
 
       - name: Save depends cache
         uses: actions/cache/save@v4

.github/workflows/build.yml

@@ -26,7 +26,7 @@ jobs:
       container-path: ${{ needs.container.outputs.path }}
 
   depends-linux64:
-    name: x86_64-pc-linux-gnu
+    name: x86_64-pc-linux-gnu_debug
     uses: ./.github/workflows/build-depends.yml
     needs: [container]
     with:

.gitlab-ci.yml

@@ -43,7 +43,10 @@ builder-image:
   image: $CI_REGISTRY_IMAGE:builder-$CI_COMMIT_REF_SLUG
   before_script:
     - |
-      echo HOST=${HOST}
+      echo BUILD_TARGET="${BUILD_TARGET}"
+      source ./ci/dash/matrix.sh
+      echo HOST="${HOST}"
+      echo DEP_OPTS="${DEP_OPTS}"
       if [[ "${HOST}" == "x86_64-apple-darwin" ]]; then
         ./contrib/containers/guix/scripts/setup-sdk
       fi
@@ -73,6 +76,8 @@ builder-image:
     - export CACHE_DIR=$CI_PROJECT_DIR/cache
     - echo BUILD_TARGET=$BUILD_TARGET
     - source ./ci/dash/matrix.sh
+    - echo HOST=${HOST}
+    - echo DEP_OPTS=${DEP_OPTS}
 
     # Setup some environment variables
     - |
@@ -170,43 +175,40 @@ builder-image:
 arm-linux-gnueabihf:
   extends: .build-depends-template
   variables:
-    HOST: arm-linux-gnueabihf
+    BUILD_TARGET: arm-linux
 
 x86_64-w64-mingw32:
   extends:
     - .build-depends-template
     - .skip-in-fast-mode-template
   variables:
-    HOST: x86_64-w64-mingw32
+    BUILD_TARGET: win64
 
 x86_64-pc-linux-gnu_debug:
   extends: .build-depends-template
   variables:
-    HOST: x86_64-pc-linux-gnu
-    DEP_OPTS: "DEBUG=1"
+    BUILD_TARGET: linux64
 
 x86_64-pc-linux-gnu_nowallet:
   extends:
     - .build-depends-template
     - .skip-in-fast-mode-template
   variables:
-    HOST: x86_64-pc-linux-gnu
-    DEP_OPTS: "NO_WALLET=1"
+    BUILD_TARGET: linux64_nowallet
 
 x86_64-pc-linux-gnu_multiprocess:
   extends:
     - .build-depends-template
     - .skip-in-fast-mode-template
   variables:
-    HOST: x86_64-pc-linux-gnu
-    DEP_OPTS: "DEBUG=1 MULTIPROCESS=1"
+    BUILD_TARGET: linux64_multiprocess
 
 x86_64-apple-darwin:
   extends:
     - .build-depends-template
     - .skip-in-fast-mode-template
   variables:
-    HOST: x86_64-apple-darwin
+    BUILD_TARGET: mac
 
 ###
 

ci/test/00_setup_env_native_multiprocess.sh

@@ -7,6 +7,7 @@
 export LC_ALL=C.UTF-8
 
 export CONTAINER_NAME=ci_native_multiprocess
+export HOST=x86_64-pc-linux-gnu
 export PACKAGES="cmake python3 llvm clang"
 export DEP_OPTS="DEBUG=1 MULTIPROCESS=1"
 export GOAL="install"

ci/test/00_setup_env_native_nowallet.sh

@@ -7,6 +7,7 @@
 export LC_ALL=C.UTF-8
 
 export CONTAINER_NAME=ci_native_nowallet
+export HOST=x86_64-pc-linux-gnu
 export PACKAGES="python3-zmq"
 export DEP_OPTS="NO_WALLET=1"
 export GOAL="install"

ci/test/00_setup_env_native_qt5.sh

@@ -9,7 +9,7 @@ export LC_ALL=C.UTF-8
 export CONTAINER_NAME=ci_native_qt5
 export HOST=x86_64-pc-linux-gnu
 export PACKAGES="python3-zmq qtbase5-dev qttools5-dev-tools libdbus-1-dev libharfbuzz-dev"
-export DEP_OPTS="NO_UPNP=1 DEBUG=1"
+export DEP_OPTS="DEBUG=1"
 export TEST_RUNNER_EXTRA="--previous-releases --coverage --extended --exclude feature_pruning,feature_dbcrash"  # Run extended tests so that coverage does not fail, but exclude the very slow dbcrash
 export RUN_UNIT_TESTS_SEQUENTIAL="true"
 export RUN_UNIT_TESTS="false"