From d5a944d0037dbbf99658927f5ead893b33b8f021 Mon Sep 17 00:00:00 2001 From: pasta Date: Sun, 11 Aug 2024 15:56:27 +0700 Subject: [PATCH] Revert: fix: missing changes from bitcoin#19267 - run multiprocess on CI This reverts commit 970048d9173bb017ee57b003557f81c051ff4f06. Refs: 970048d9173bb017ee57b003557f81c051ff4f06 --- .gitlab-ci.yml | 51 +++++++++++++++++++++++++++----------------------- 1 file changed, 28 insertions(+), 23 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b4a4e68427e47..bd5c877dfabe5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -203,13 +203,16 @@ x86_64-pc-linux-gnu-nowallet: HOST: x86_64-pc-linux-gnu DEP_OPTS: "NO_WALLET=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" +## 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-apple-darwin: extends: @@ -306,14 +309,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: @@ -378,14 +381,16 @@ linux64_ubsan-test: variables: BUILD_TARGET: linux64_ubsan -linux64_multiprocess-test: - extends: - - .test-template - - .skip-in-fast-mode-template - needs: - - linux64_multiprocess-build - variables: - BUILD_TARGET: linux64_multiprocess +# 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_valgrind-test: # extends: