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

CI changelogs: switch to XDG, fix cache key (backport #9849) #10008

Merged
merged 2 commits into from
May 14, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented May 13, 2024

This is the same as #9845 but for the changelogs.yml workflow.


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

@mergify mergify bot added the conflicts label May 13, 2024
Copy link
Contributor Author

mergify bot commented May 13, 2024

Cherry-pick of af5d606 has failed:

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

You are currently cherry-picking commit af5d60613.
  (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/changelogs.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/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@Kleidukos Kleidukos added the squash+merge me Tell Mergify Bot to squash-merge label May 13, 2024
@ulysses4ever ulysses4ever force-pushed the mergify/bp/3.12/pr-9849 branch from fecd2b1 to b99aa86 Compare May 13, 2024 18:57
@ulysses4ever ulysses4ever removed the squash+merge me Tell Mergify Bot to squash-merge label May 13, 2024
@ulysses4ever
Copy link
Collaborator

I unlabel it for merging while we're investigating the fix-whitespace failure in #10007

@ulysses4ever ulysses4ever force-pushed the mergify/bp/3.12/pr-9849 branch from b99aa86 to 3f6a1b4 Compare May 14, 2024 02:03
@ulysses4ever ulysses4ever added the merge me Tell Mergify Bot to merge label May 14, 2024
@ulysses4ever
Copy link
Collaborator

All right, back on track. Some analysis is in #9818 (comment)

@ulysses4ever ulysses4ever force-pushed the mergify/bp/3.12/pr-9849 branch from 3f6a1b4 to f585aea Compare May 14, 2024 02:04
ulysses4ever and others added 2 commits May 14, 2024 04:46
This is the same as #9845 but for the changelogs.yml workflow.

`changelog-d` currently has restrictive bound `base < 4.19` which we
need to ignore if we want to build on the latest GHC as shipped by the
GHA runner.

(cherry picked from commit af5d606)
@Mikolaj Mikolaj force-pushed the mergify/bp/3.12/pr-9849 branch from f585aea to b710193 Compare May 14, 2024 04:46
@mergify mergify bot merged commit 0227d22 into 3.12 May 14, 2024
49 of 50 checks passed
@mergify mergify bot deleted the mergify/bp/3.12/pr-9849 branch May 14, 2024 07:22
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.

3 participants