From 970048d9173bb017ee57b003557f81c051ff4f06 Mon Sep 17 00:00:00 2001 From: Konstantin Akimov Date: Sat, 13 Jul 2024 22:35:25 +0700 Subject: [PATCH] fix: missing changes from bitcoin#19267 - run multiprocess on CI They run multiprocess build for ALL PRs in travis since that commit ```diff - if: type != pull_request OR commit_message =~ /depends:|multiprocess:/ # Skip on non-depends, non-multiprocess PRs ``` --- .gitlab-ci.yml | 51 +++++++++++++++++++++++--------------------------- 1 file changed, 23 insertions(+), 28 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index bd5c877dfa..b4a4e68427 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -203,16 +203,13 @@ x86_64-pc-linux-gnu-nowallet: HOST: x86_64-pc-linux-gnu DEP_OPTS: "NO_WALLET=1" -## TODO: # Skip on non-depends, non-multiprocess PRs -## if: type != pull_request OR commit_message =~ /depends:|multiprocess:/ -#x86_64-pc-linux-gnu-multiprocess: -# extends: -# - .build-depends-template -# - .skip-in-fast-mode-template -# variables: -# HOST: x86_64-pc-linux-gnu -# DEP_OPTS: "MULTIPROCESS=1" -# +x86_64-pc-linux-gnu-multiprocess: + extends: + - .build-depends-template + - .skip-in-fast-mode-template + variables: + HOST: x86_64-pc-linux-gnu + DEP_OPTS: "MULTIPROCESS=1" x86_64-apple-darwin: extends: @@ -309,14 +306,14 @@ linux64_nowallet-build: variables: BUILD_TARGET: linux64_nowallet -#linux64_multiprocess-build: -# extends: -# - .build-template -# - .skip-in-fast-mode-template -# needs: -# - x86_64-pc-linux-gnu-multiprocess -# variables: -# BUILD_TARGET: linux64_multiprocess +linux64_multiprocess-build: + extends: + - .build-template + - .skip-in-fast-mode-template + needs: + - x86_64-pc-linux-gnu-multiprocess + variables: + BUILD_TARGET: linux64_multiprocess #linux64_valgrind-build: # extends: @@ -381,16 +378,14 @@ linux64_ubsan-test: variables: BUILD_TARGET: linux64_ubsan -# TODO: enable multiprocess back in CI once it has any value -# or in case if any new backports to test -#linux64_multiprocess-test: -# extends: -# - .test-template -# - .skip-in-fast-mode-template -# needs: -# - linux64_multiprocess-build -# variables: -# BUILD_TARGET: linux64_multiprocess +linux64_multiprocess-test: + extends: + - .test-template + - .skip-in-fast-mode-template + needs: + - linux64_multiprocess-build + variables: + BUILD_TARGET: linux64_multiprocess #linux64_valgrind-test: # extends: