Skip to content

Conversation

@hebasto
Copy link
Member

@hebasto hebasto commented Aug 19, 2021

  1. Remove Cirrus CI configuration parsing warning:
    Screenshot from 2021-08-20 01-13-57
    Screenshot from 2021-08-20 01-13-41

  2. Make git available for merge commits, because it is now required for depends_sources_cache and depends_built_cache.

@hebasto
Copy link
Member Author

hebasto commented Aug 19, 2021

cc @MarcoFalke

-BEGIN VERIFY SCRIPT-
sed -i 's/\btask_template/main_template/' .cirrus.yml
sed -i 's/\bTASK_TEMPLATE/MAIN_TEMPLATE/' .cirrus.yml
-END VERIFY SCRIPT-
@DrahtBot
Copy link
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.

@maflcko
Copy link
Member

maflcko commented Aug 20, 2021

ack

@maflcko maflcko merged commit 0263583 into bitcoin:master Aug 20, 2021
@hebasto hebasto deleted the 210819-yaml branch August 20, 2021 06:55
sidhujag pushed a commit to syscoin/syscoin that referenced this pull request Aug 20, 2021
e9cf506 ci: Make git available for all merge commits (Hennadii Stepanov)
040e4de 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
@bitcoin bitcoin locked as resolved and limited conversation to collaborators Aug 20, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants