Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Mergify and actions upgrades (backport #10260) #10300

Merged
merged 1 commit into from
Sep 13, 2024
Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 30, 2024

Mergify is requiring different queues for different merge strategies as of mid-September.
actions/upload-artifact@v3 and actions/download-artifact@v3 are being removed in November.

Template B: This PR does not modify behaviour or interface

E.g. the PR only touches documentation or tests, does refactorings, etc.

Include the following checklist in your PR:

  • Patches conform to the coding conventions.
  • Is this a PR that fixes CI? If so, it will need to be backported to older cabal release branches (ask maintainers for directions).

This is an automatic backport of pull request #10260 done by [Mergify](https://mergify.com).

Copy link
Contributor Author

mergify bot commented Aug 30, 2024

Cherry-pick of 75711fc has failed:

On branch mergify/bp/3.12/pr-10260
Your branch is up to date with 'origin/3.12'.

You are currently cherry-picking commit 75711fca5.
  (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/bootstrap.yml
	modified:   .github/workflows/users-guide.yml

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   .github/mergify.yml
	both modified:   .github/workflows/validate.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

@mergify mergify bot added the conflicts label Aug 30, 2024
@mergify mergify bot mentioned this pull request Aug 30, 2024
2 tasks
@mergify mergify bot added the backport label Aug 30, 2024
@geekosaur geekosaur force-pushed the mergify/bp/3.12/pr-10260 branch 2 times, most recently from 71c49d0 to eda77cc Compare August 30, 2024 21:46
@geekosaur geekosaur closed this Sep 3, 2024
@mergify mergify bot deleted the mergify/bp/3.12/pr-10260 branch September 3, 2024 03:06
@geekosaur geekosaur restored the mergify/bp/3.12/pr-10260 branch September 13, 2024 00:16
@geekosaur geekosaur reopened this Sep 13, 2024
@geekosaur geekosaur force-pushed the mergify/bp/3.12/pr-10260 branch from eda77cc to 467eef4 Compare September 13, 2024 15:14
@geekosaur geekosaur added merge me Tell Mergify Bot to merge and removed conflicts labels Sep 13, 2024
Copy link
Collaborator

@geekosaur geekosaur left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note that the Mergify part does nothing, since Mergify only looks at master. But the actions are needed.

* upgrade actions/upload-artifact to v4

* update Mergify queue strategies

Mergify is requiring that separate queues be used for different
merge strategies, staerting in mid-September with a brownout in
mid-August.

https://docs.mergify.com/configuration/file-format/#queue-rules

* update actions/download-artifact

This one wasn't throwing warnings, but has also been updated with
the same deprecation timeframe. It's also incompatible with
actions/upload-artifact@v4.

---------

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
(cherry picked from commit 75711fc)
@Mikolaj Mikolaj force-pushed the mergify/bp/3.12/pr-10260 branch from 467eef4 to c2e5c5c Compare September 13, 2024 21:38
@mergify mergify bot merged commit 86f7f2c into 3.12 Sep 13, 2024
52 checks passed
@mergify mergify bot deleted the mergify/bp/3.12/pr-10260 branch September 13, 2024 23:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport merge me Tell Mergify Bot to merge
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant