mirror of
https://github.com/dashpay/dash.git
synced 2024-12-24 19:42:46 +01:00
Merge #6489: ci: allow overriding MAKEJOBS
feb6a1ad3f
ci: allow overriding MAKEJOBS (UdjinM6) Pull request description: ## Issue being fixed or feature implemented That's how these variable are ment to behave >echo "Fallback to default values in env (if not yet set)" https://github.com/dashpay/dash/blame/develop/ci/test/00_setup_env.sh#L26 That's also how it's done in bitcoin https://github.com/bitcoin/bitcoin/blob/master/ci/test/00_setup_env.sh#L38. But we broke it inc52992aaa4
and I'm not sure why 🤷♂️ ## What was done? ## How Has This Been Tested? ## Breaking Changes ## Checklist: - [ ] 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 - [ ] I have assigned this pull request to a milestone _(for repository code-owners and collaborators only)_ ACKs for top commit: PastaPastaPasta: utACKfeb6a1ad3f
kwvg: utACKfeb6a1ad3f
Tree-SHA512: 617e761cf5c52d8e4329bf8aa1680c72a7816ae3248ed415d2c3232e5aa0941f18e21f0d6d363848238f53730097aa22f51a6e1cd62bd0b31d3da853f9f79e28
This commit is contained in:
commit
05ca6cffff
@ -25,8 +25,7 @@ export JOB_NUMBER=${JOB_NUMBER:-1}
|
|||||||
|
|
||||||
echo "Fallback to default values in env (if not yet set)"
|
echo "Fallback to default values in env (if not yet set)"
|
||||||
# The number of parallel jobs to pass down to make and test_runner.py
|
# The number of parallel jobs to pass down to make and test_runner.py
|
||||||
MAKEJOBS="-j$(nproc)"
|
export MAKEJOBS=${MAKEJOBS:--j$(nproc)}
|
||||||
export MAKEJOBS
|
|
||||||
# A folder for the ci system to put temporary files (ccache, datadirs for tests, ...)
|
# A folder for the ci system to put temporary files (ccache, datadirs for tests, ...)
|
||||||
# This folder only exists on the ci host.
|
# This folder only exists on the ci host.
|
||||||
export BASE_SCRATCH_DIR=${BASE_SCRATCH_DIR:-$BASE_ROOT_DIR/ci/scratch}
|
export BASE_SCRATCH_DIR=${BASE_SCRATCH_DIR:-$BASE_ROOT_DIR/ci/scratch}
|
||||||
|
Loading…
Reference in New Issue
Block a user