mirror/bitcoin
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge bitcoin/bitcoin#22750: ci: Followups for #22710

Browse Source 
e9cf506ab0 ci: Make git available for all merge commits (Hennadii Stepanov)
040e4deddc scripted-diff: Rename template to avoid CI configuration parsing warning (Hennadii Stepanov)

Pull request description:

  1) Remove Cirrus CI configuration parsing warning:
  ![Screenshot from 2021-08-20 01-13-57](https://user-images.githubusercontent.com/32963518/130151265-551873cb-6670-48a6-b0c4-687cb341a342.png)
  ![Screenshot from 2021-08-20 01-13-41](https://user-images.githubusercontent.com/32963518/130151273-920fb316-e7e1-457b-8933-2ac31e9c605f.png)

  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
This commit is contained in:
MarcoFalke committed 2021-08-20 08:28:26 +02:00
2 parents 5b6104edf0 e9cf506ab0
commit 0263583ad9
1 file changed
+4 -4
Download Patch File Download Diff File Expand all files Collapse all files
.cirrus.yml
+4 -4
View File
@@ -21,15 +21,15 @@ persistent_worker_template: &PERSISTENT_WORKER_TEMPLATE
base_template: &BASE_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 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: merge_base_script:
- if [ "$CIRRUS_PR" = "" ]; then exit 0; fi
- bash -c "$PACKAGE_MANAGER_INSTALL git" - bash -c "$PACKAGE_MANAGER_INSTALL git"
- if [ "$CIRRUS_PR" = "" ]; then exit 0; fi
- git fetch $CIRRUS_REPO_CLONE_URL $CIRRUS_BASE_BRANCH - git fetch $CIRRUS_REPO_CLONE_URL $CIRRUS_BASE_BRANCH
- git config --global user.email "ci@ci.ci" - git config --global user.email "ci@ci.ci"
- git config --global user.name "ci" - git config --global user.name "ci"
- git merge FETCH_HEAD # Merge base to detect silent merge conflicts - git merge FETCH_HEAD # Merge base to detect silent merge conflicts
stateful: false # https://cirrus-ci.org/guide/writing-tasks/#stateful-tasks 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 timeout_in: 120m # https://cirrus-ci.org/faq/#instance-timed-out
container: container:
# https://cirrus-ci.org/faq/#are-there-any-limits # https://cirrus-ci.org/faq/#are-there-any-limits
@@ -46,7 +46,7 @@ task_template: &TASK_TEMPLATE
global_task_template: &GLOBAL_TASK_TEMPLATE global_task_template: &GLOBAL_TASK_TEMPLATE
<< : *BASE_TEMPLATE << : *BASE_TEMPLATE
<< : *TASK_TEMPLATE << : *MAIN_TEMPLATE
depends_sdk_cache_template: &DEPENDS_SDK_CACHE_TEMPLATE depends_sdk_cache_template: &DEPENDS_SDK_CACHE_TEMPLATE
depends_sdk_cache: depends_sdk_cache:
@@ -219,7 +219,7 @@ task:
depends_sources_cache: depends_sources_cache:
folder: "depends/sources" folder: "depends/sources"
fingerprint_script: git rev-list -1 HEAD ./depends fingerprint_script: git rev-list -1 HEAD ./depends
<< : *TASK_TEMPLATE << : *MAIN_TEMPLATE
container: container:
image: ubuntu:focal image: ubuntu:focal
env: env: