Closed mergify[bot] closed 3 months ago
Cherry-pick of 7f6f423578481ccebdbd33994708cfa45f67c60b has failed:
On branch mergify/bp/2.13.x/pr-4971
Your branch is up to date with 'origin/2.13.x'.
You are currently cherry-picking commit 7f6f42357.
(fix conflicts and run "git cherry-pick --continue")
(use "git cherry-pick --skip" to skip this patch)
(use "git cherry-pick --abort" to cancel the cherry-pick operation)
Changes to be committed:
modified: .github/workflows/reusable-mac-ci.yml
modified: .github/workflows/reusable-sanitizers-ci.yml
Unmerged paths:
(use "git add/rm <file>..." as appropriate to mark resolution)
both modified: .github/workflows/mac-ci.yml
deleted by us: .github/workflows/nightly-mac-ci.yml
deleted by us: .github/workflows/nightly-ubuntu-ci.yml
To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally
To ensure that the Sanitizer job does not use CCache (it has been skipped due to the no-test
flag), a manual run has been triggered with ctest-args -N
to avoid running tests.
All jobs have skipped the setup CCache step. Ready to merge!
Description
This PR performs the following improvements in this project CI:
Important: Backports must remove nightly workflows
@Mergifyio backport 2.14.x 2.13.x 2.10.x 2.6.x
Contributor Checklist
[x] Commit messages follow the project guidelines.
N/A The code follows the style guidelines of this project.
N/A Tests that thoroughly check the new feature have been added/Regression tests checking the bug and its fix have been added; the added tests pass locally
N/A Any new/modified methods have been properly documented using Doxygen.
N/A Any new configuration API has an equivalent XML API (with the corresponding XSD extension)
N/A Changes are backport compatible: they do NOT break ABI nor change library core behavior.
N/A Changes are API compatible.
N/A New feature has been added to the
versions.md
file (if applicable).N/A New feature has been documented/Current behavior is correctly described in the documentation.
[x] Applicable backports have been included in the description.
Reviewer Checklist
This is an automatic backport of pull request #4971 done by Mergify.