Skip to content

Commit

Permalink
Merge dashpay#6195: revert: fix: missing changes from bitcoin#19267 -…
Browse files Browse the repository at this point in the history
… run multiprocess on CI

d5a944d Revert: fix: missing changes from bitcoin#19267 - run multiprocess on CI (pasta)

Pull request description:

  ## Issue being fixed or feature implemented
  See dashpay#6192 for a discussion around this: for now simply make CI happy again, by not running for multiprocessor (since this is new, and unstable / dev feature, and not something shipped).

  ## What was done?
  Revert commit which reintroduces multiprocessor CI while we investigate proper fix

  ## How Has This Been Tested?
  CI

  ## Breaking Changes

  ## Checklist:
    _Go over all the following points, and put an `x` in all the boxes that apply._
  - [ ] I have performed a self-review of my own code
  - [ ] I have commented my code, particularly in hard-to-understand areas
  - [ ] I have added or updated relevant unit/integration/functional/e2e tests
  - [ ] I have made corresponding changes to the documentation
  - [x] I have assigned this pull request to a milestone _(for repository code-owners and collaborators only)_

Top commit has no ACKs.

Tree-SHA512: d878b02efc72019e09b09e2482e63dca276824b66272135e00ff340ba60b5b58e5f5ae3feff3b894f08958ca8fc6ce71f91c926f6aaf29a459d6230f129316f6
  • Loading branch information
PastaPastaPasta committed Aug 11, 2024
2 parents de4e7e1 + d5a944d commit 2914433
Showing 1 changed file with 28 additions and 23 deletions.
51 changes: 28 additions & 23 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down

0 comments on commit 2914433

Please sign in to comment.