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

CI: remove cabal-head before updating it (fix #10537) #10654

Merged
merged 1 commit into from
Dec 19, 2024
Merged

CI: remove cabal-head before updating it (fix #10537) #10654

merged 1 commit into from
Dec 19, 2024
+8 −1

Conversation

TeofilC
Copy link
Collaborator

@TeofilC TeofilC commented Dec 19, 2024

This PR is #10540 rebased.

It should fix #10537 and its duplicate #10652

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.
  • [n/a] Is this a PR that fixes CI? If so, it will need to be backported to older cabal release branches (ask maintainers for directions).

@TeofilC TeofilC mentioned this pull request Dec 19, 2024
Closed
geekosaur
geekosaur requested changes Dec 19, 2024
View reviewed changes
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.

Can this be applied to prerelease-lts as well? (Not that that is currently functional; it needs to move to a nightly, because when a PR doesn't need to be rebased Mergify pushes it in without running the workflow so it never gets a chance to run.)

ulysses4ever
ulysses4ever approved these changes Dec 19, 2024
View reviewed changes
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.

Thank you!

@TeofilC
Copy link
Collaborator Author

TeofilC commented Dec 19, 2024

Can this be applied to prerelease-lts as well? (Not that that is currently functional; it needs to move to a nightly, because when a PR doesn't need to be rebased Mergify pushes it in without running the workflow so it never gets a chance to run.)

Done

@geekosaur
Copy link
Collaborator

Do we want to expedite this in the name of getting the prereleases properly back in action?

@ulysses4ever
Copy link
Collaborator

Sure, we can do that.

@ulysses4ever ulysses4ever added priority: high 🔥 merge me Tell Mergify Bot to merge labels Dec 19, 2024
@mergify mergify bot added the merge delay passed Applied (usually by Mergify) when PR approved and received no updates for 2 days label Dec 19, 2024
@geekosaur geekosaur removed the merge me Tell Mergify Bot to merge label Dec 19, 2024
@geekosaur
Copy link
Collaborator

Something's wrong, validate.yml isn't being run. I wonder if your indentation change broke it.

@geekosaur
Copy link
Collaborator 

Invalid workflow file: .github/workflows/validate.yml#L468
You have an error in your yaml syntax on line 468

@TeofilC TeofilC force-pushed the wip/T10652 branch 2 times, most recently from 85baf34 to 3228435 Compare December 19, 2024 14:52
@TeofilC
Copy link
Collaborator Author

TeofilC commented Dec 19, 2024

Good spot. I've fixed the indention now (I think)

@geekosaur
Copy link
Collaborator 

Invalid workflow file: .github/workflows/validate.yml#L497
You have an error in your yaml syntax on line 497

I hate YAML-as-code…

@TeofilC
Copy link
Collaborator Author

TeofilC commented Dec 19, 2024

Yeah right. 🤞 that it works this time

@ulysses4ever
Copy link
Collaborator

As an anecdote: when I wrote this patch I also had to fix it up about 4 times because of incorrect indentation in YAML. Maybe it wasn't correct after all...

@geekosaur geekosaur added the merge me Tell Mergify Bot to merge label Dec 19, 2024
@geekosaur
Copy link
Collaborator

The indentation gave me a fair amount of pain when doing the CI rewrite as well, in part because it was so inconsistent between jobs. I think I made it all consistent as part of it.

@mergify mergify bot added the ready and waiting Mergify is waiting out the cooldown period label Dec 19, 2024
@mergify mergify bot merged commit fc186ef into master Dec 19, 2024
49 of 50 checks passed
@mergify mergify bot deleted the wip/T10652 branch December 19, 2024 16:42
@geekosaur
Copy link
Collaborator

@mergify backport 3.12

@mergify Mergify
Copy link
Contributor

mergify bot commented Dec 20, 2024 •
edited
Loading

backport 3.12

✅ Backports have been created

@mergify mergify bot mentioned this pull request Dec 20, 2024
Merged
1 task
mergify bot added a commit that referenced this pull request Dec 21, 2024
@mergify @ulysses4ever @geekosaur
Backport #10654: CI: remove cabal-head before updating it (fix #10537) (
1d84640 
#10657)

* CI: remove cabal{,-lts}-head before updating it (fix #10537)

(cherry picked from commit 9949014)

* The release cleanup action requires a token

(cherry picked from commit ad266b1)

---------

Co-authored-by: Artem Pelenitsyn <[email protected]>
Co-authored-by: brandon s allbery kf8nh <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ulysses4ever ulysses4ever ulysses4ever approved these changes

@geekosaur geekosaur geekosaur approved these changes

Assignees
No one assigned
Labels
merge delay passed Applied (usually by Mergify) when PR approved and received no updates for 2 days merge me Tell Mergify Bot to merge priority: high 🔥 ready and waiting Mergify is waiting out the cooldown period
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

cabal-head prerelase date and commit are not updated
3 participants
@TeofilC @geekosaur @ulysses4ever