ci: Followups for #22710 #22750

pull hebasto wants to merge 2 commits into bitcoin:master from hebasto:210819-yaml changing 1 files +4 −4

hebasto commented at 10:15 PM on August 19, 2021: member
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.
hebasto commented at 10:16 PM on August 19, 2021: member

cc @MarcoFalke
hebasto force-pushed on Aug 19, 2021

scripted-diff: Rename template to avoid CI configuration parsing warning

-BEGIN VERIFY SCRIPT-
sed -i 's/\btask_template/main_template/' .cirrus.yml
sed -i 's/\bTASK_TEMPLATE/MAIN_TEMPLATE/' .cirrus.yml
-END VERIFY SCRIPT-

040e4deddc

ci: Make git available for all merge commits e9cf506ab0
hebasto force-pushed on Aug 19, 2021
DrahtBot added the label Tests on Aug 20, 2021
DrahtBot commented at 5:26 AM on August 20, 2021: contributor


The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.



Conflicts

Reviewers, this pull request conflicts with the following ones:
- #22744 (ci: Re-enable verify-commits.py check by MarcoFalke)
If you consider this pull request important, please also help to review the conflicting pull requests. Ideally, start with the one that should be merged first.
DrahtBot cross-referenced this on Aug 20, 2021 from issue ci: Re-enable verify-commits.py check by MarcoFalke
MarcoFalke commented at 6:28 AM on August 20, 2021: member

ack
MarcoFalke merged this on Aug 20, 2021
MarcoFalke closed this on Aug 20, 2021
hebasto deleted the branch on Aug 20, 2021
sidhujag referenced this in commit 1215cacb4f on Aug 20, 2021
bitcoin locked this on Aug 20, 2022

Contributors

Labels