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.

Sign up for GitHub

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

Jump to bottom

Migrate to haskell-actions/setup (backport #9463) #9485

Merged
merged 1 commit into from
Dec 16, 2023
Merged

Migrate to haskell-actions/setup (backport #9463) #9485

merged 1 commit into from
Dec 16, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Nov 29, 2023

This is an automatic backport of pull request #9463 done by Mergify.
Cherry-pick of 8e09697 has failed:

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

You are currently cherry-picking commit 8e0969708.
  (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)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   .github/workflows/validate.yml

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

@mergify mergify bot added the conflicts label Nov 29, 2023
@mergify mergify bot mentioned this pull request Nov 29, 2023
Merged
@mergify mergify bot added the backport label Nov 29, 2023
@Kleidukos Kleidukos self-assigned this Nov 29, 2023
@jasagredo jasagredo force-pushed the mergify/bp/3.10/pr-9463 branch from 39b30d8 to 78d5041 Compare December 16, 2023 15:19
@jasagredo
Copy link
Collaborator

I have rebased this on top of 3.10 and fixed the rebase conflicts.

@jasagredo
Copy link
Collaborator

In fact I deleted a chunk by mistake, let me fix it

@jasagredo jasagredo force-pushed the mergify/bp/3.10/pr-9463 branch from 78d5041 to 61d3c18 Compare December 16, 2023 15:22
@andreabedini @jasagredo
Migrate to haskell-actions/setup
61d3c18 
As of 2023-09-09, haskell/action/setup is no longer maintained.

The comment

  # latest is mandatory for cabal-testsuite, see #8133

is removed; as the validate job was already fixing a version of cabal-install.

(cherry picked from commit 8e09697)

# Conflicts:
#	.github/workflows/validate.yml
Mikolaj
Mikolaj approved these changes Dec 16, 2023
View reviewed changes
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.

Thank you!

@jasagredo
Copy link
Collaborator

@mergify merge

@mergify Mergify
Copy link
Contributor Author

mergify bot commented Dec 16, 2023

merge

❌ Sorry but I didn't understand the command. Please consult the commands documentation 📚.

@jasagredo jasagredo added the merge me Tell Mergify Bot to merge label Dec 16, 2023
@jasagredo
Copy link
Collaborator

Ah it was a label not a command 😅

@mergify mergify bot merged commit 7553f8a into 3.10 Dec 16, 2023
40 checks passed
@mergify mergify bot deleted the mergify/bp/3.10/pr-9463 branch December 16, 2023 20:07
@mergify mergify bot added the merge delay passed Applied (usually by Mergify) when PR approved and received no updates for 2 days label Dec 18, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jasagredo jasagredo jasagredo approved these changes

@Mikolaj Mikolaj Mikolaj approved these changes

@andreabedini andreabedini Awaiting requested review from andreabedini

@Kleidukos Kleidukos Awaiting requested review from Kleidukos

Assignees

@Kleidukos Kleidukos

Labels
backport merge delay passed Applied (usually by Mergify) when PR approved and received no updates for 2 days merge me Tell Mergify Bot to merge
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@jasagredo @Mikolaj @Kleidukos @andreabedini