Remove Cirrus CI configuration parsing warning:

Make
gitavailable for merge commits, because it is now required fordepends_sources_cacheanddepends_built_cache.
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
-
hebasto commented at 10:16 PM on August 19, 2021: member
cc @MarcoFalke
- hebasto force-pushed on Aug 19, 2021
-
040e4deddc
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-
-
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: member
<!--e57a25ab6845829454e8d69fc972939a-->
The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.
<!--174a7506f384e20aa4161008e828411d-->
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.
-
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
- DrahtBot locked this on Aug 20, 2022
Contributors
Labels