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 #10260

Merged
merged 4 commits into from
Aug 19, 2024
Merged

Conversation

geekosaur
Copy link
Collaborator

@geekosaur geekosaur commented Aug 16, 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).

@geekosaur geekosaur force-pushed the mergify-actions-upgrades branch from 09e4a83 to bca9211 Compare August 16, 2024 21:35
@geekosaur
Copy link
Collaborator Author

I did a quick audit of the other actions we use in our workflows; it looks like only upload-artifacts has changed.

@geekosaur
Copy link
Collaborator Author

BTW, the summary still complains about the configuration. This is because it uses the Mergify configuration on master, not the one in this PR. "Configuration changed" validates the one in this PR, and is clean.

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
@geekosaur geekosaur force-pushed the mergify-actions-upgrades branch from bca9211 to bcaa508 Compare August 16, 2024 22:16
Copy link
Collaborator

@ulysses4ever ulysses4ever left a comment

Choose a reason for hiding this comment

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

Thanks!

Some unfortunate repetition with Mikolaj but that's not an issue: we can't have too much @Mikolaj!!!

@geekosaur
Copy link
Collaborator Author

Sadly, while there is a defaults section it doesn't apply to queue_rules.

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.
@geekosaur geekosaur force-pushed the mergify-actions-upgrades branch from 9b13595 to c7ac80c Compare August 17, 2024 00:07
Copy link
Member

@Mikolaj Mikolaj left a comment

Choose a reason for hiding this comment

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

At least we have a competent bot! :D

@geekosaur geekosaur added squash+merge me Tell Mergify Bot to squash-merge and removed attention: needs-review labels Aug 17, 2024
@mergify mergify bot added the merge delay passed Applied (usually by Mergify) when PR approved and received no updates for 2 days label Aug 19, 2024
@mergify mergify bot merged commit 75711fc into haskell:master Aug 19, 2024
51 checks passed
geekosaur added a commit that referenced this pull request Aug 22, 2024
mergify bot added a commit that referenced this pull request Aug 24, 2024
* implement mergify rules for release branches

We only handled the case of backports previously, but the current
release checklist expects that we can commit PRs to release
branches during a release (e.g. changelogs, because we want the
list of changelog.d files that are actually part of the release).

* block merging if PR has a 'blocked:' label

* update backports strategy for #10260

---------

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
@geekosaur
Copy link
Collaborator Author

@mergify backport 3.12

Copy link
Contributor

mergify bot commented Aug 30, 2024

backport 3.12

✅ Backports have been created

@geekosaur geekosaur deleted the mergify-actions-upgrades branch August 30, 2024 21:17
mergify bot pushed a commit that referenced this pull request Aug 30, 2024
* 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)

# Conflicts:
#	.github/mergify.yml
#	.github/workflows/validate.yml
geekosaur added a commit that referenced this pull request Aug 30, 2024
* 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)
geekosaur added a commit that referenced this pull request Aug 30, 2024
* 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)
geekosaur added a commit that referenced this pull request Sep 13, 2024
* 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 pushed a commit that referenced this pull request Sep 13, 2024
* 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)
mergify bot added a commit that referenced this pull request Sep 13, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merge delay passed Applied (usually by Mergify) when PR approved and received no updates for 2 days squash+merge me Tell Mergify Bot to squash-merge
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants