diff options
Diffstat (limited to '.cirrus.yml')
| -rw-r--r-- | .cirrus.yml | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/.cirrus.yml b/.cirrus.yml index ce5e2355a7..fe75403261 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -21,15 +21,15 @@ persistent_worker_template: &PERSISTENT_WORKER_TEMPLATE base_template: &BASE_TEMPLATE skip: $CIRRUS_REPO_FULL_NAME == "bitcoin-core/gui" && $CIRRUS_PR == "" # No need to run on the read-only mirror, unless it is a PR. https://cirrus-ci.org/guide/writing-tasks/#conditional-task-execution merge_base_script: - - if [ "$CIRRUS_PR" = "" ]; then exit 0; fi - bash -c "$PACKAGE_MANAGER_INSTALL git" + - if [ "$CIRRUS_PR" = "" ]; then exit 0; fi - git fetch $CIRRUS_REPO_CLONE_URL $CIRRUS_BASE_BRANCH - git config --global user.email "ci@ci.ci" - git config --global user.name "ci" - git merge FETCH_HEAD # Merge base to detect silent merge conflicts stateful: false # https://cirrus-ci.org/guide/writing-tasks/#stateful-tasks -task_template: &TASK_TEMPLATE +main_template: &MAIN_TEMPLATE timeout_in: 120m # https://cirrus-ci.org/faq/#instance-timed-out container: # https://cirrus-ci.org/faq/#are-there-any-limits @@ -46,7 +46,7 @@ task_template: &TASK_TEMPLATE global_task_template: &GLOBAL_TASK_TEMPLATE << : *BASE_TEMPLATE - << : *TASK_TEMPLATE + << : *MAIN_TEMPLATE depends_sdk_cache_template: &DEPENDS_SDK_CACHE_TEMPLATE depends_sdk_cache: @@ -160,6 +160,7 @@ task: task: name: '[no depends, sanitizers: fuzzer,address,undefined,integer] [focal]' + only_if: $CIRRUS_BRANCH == $CIRRUS_DEFAULT_BRANCH || $CIRRUS_BASE_BRANCH == $CIRRUS_DEFAULT_BRANCH << : *GLOBAL_TASK_TEMPLATE container: image: ubuntu:focal @@ -222,7 +223,7 @@ task: depends_sources_cache: folder: "depends/sources" fingerprint_script: git rev-list -1 HEAD ./depends - << : *TASK_TEMPLATE + << : *MAIN_TEMPLATE container: image: ubuntu:focal env: |