diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2021-08-20 08:27:59 +0200 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2021-08-20 08:28:26 +0200 |
| commit | 0263583ad9ac7898395c20245d1e073496ab31e8 (patch) | |
| tree | dacae7c9c76681fcbd2d223e154466fca5e5d06e | |
| parent | 5b6104edf0d3bcd7ac6013b52016e4f8e6db1815 (diff) | |
| parent | e9cf506ab015ba095dbf6a69ec4b7278dbdc548b (diff) | |
Merge bitcoin/bitcoin#22750: ci: Followups for #22710
e9cf506ab015ba095dbf6a69ec4b7278dbdc548b ci: Make git available for all merge commits (Hennadii Stepanov)
040e4deddcc176ecd8022549474fc79cd6fa05f5 scripted-diff: Rename template to avoid CI configuration parsing warning (Hennadii Stepanov)
Pull request description:
1) Remove Cirrus CI configuration parsing warning:
2) Make `git` available for merge commits, because it is now required for `depends_sources_cache` and `depends_built_cache`.
Top commit has no ACKs.
Tree-SHA512: d5cfb49492d2635fc2019220b0023179e09608bcb5a77c3d445e53c4cd714b145d6107ae02f2e3d0e2b196c2974b4688ae3e4fc233beb0917da29771795ed08e
| -rw-r--r-- | .cirrus.yml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/.cirrus.yml b/.cirrus.yml index 3e2e8864ac..2a5b3d4fbe 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: @@ -219,7 +219,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: |