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: add GHC pre-release (backport #8754) #8803

Closed
wants to merge 3 commits into from
Closed

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Feb 23, 2023

This is an automatic backport of pull request #8754 done by Mergify.
Cherry-pick of 91393b4 has failed:

On branch mergify/bp/3.10/pr-8754
Your branch is ahead of 'origin/3.10' by 1 commit.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 91393b4cc.
  (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/changelogs.yml
	modified:   .github/workflows/validate.yml

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

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

- -XTypeInType is deprecated
- skip failing JS test on Windows
  Cf. #8754 (comment)
- deal with lift2A in Prelude since base-4.18 (GHC 9.6)
- disable everfailing Backpack tests

(cherry picked from commit 87ac120)
(cherry picked from commit 91393b4)

# Conflicts:
#	.github/workflows/quick-jobs.yml
Had to block lib/cli-suite tests on Windows, see discussion starting here:

- #8754 (comment)

(cherry picked from commit 9e9a865)
@mergify mergify bot added the conflicts label Feb 23, 2023
@mergify mergify bot mentioned this pull request Feb 23, 2023
@mergify mergify bot added the backport label Feb 23, 2023
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.

We need better CI and better GHC 9.6 compatibility on the 3.10 branch, so this PR is needed.

@Mikolaj
Copy link
Member

Mikolaj commented Feb 23, 2023

Let's wait until merging of #8804 resolves the conflict.

@Mikolaj
Copy link
Member

Mikolaj commented Feb 24, 2023

@mergify rebase

@mergify
Copy link
Contributor Author

mergify bot commented Feb 24, 2023

rebase

❌ Base branch update has failed

Git reported the following error:

Rebasing (1/3)
Rebasing (2/3)
Auto-merging .github/workflows/quick-jobs.yml
CONFLICT (content): Merge conflict in .github/workflows/quick-jobs.yml
error: could not apply 2a685d114... CI: update actions/cache to v3
hint: Resolve all conflicts manually, mark them as resolved with
hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
hint: You can instead skip this commit: run "git rebase --skip".
hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply 2a685d114... CI: update actions/cache to v3

err-code: A8685

@Mikolaj
Copy link
Member

Mikolaj commented Feb 24, 2023

It seems mergify incorporated the conflicts into the initial shape of this branch and we can't remove them automatically, only manually. We also can't make another backport, either, which would now be clean. Perhaps I can make a copy of this branch, backport there and from there to here.

@Mikolaj
Copy link
Member

Mikolaj commented Feb 24, 2023

Here's a hacked backport without the merge conflict. Let's move there. #8806

@Mikolaj
Copy link
Member

Mikolaj commented Feb 24, 2023

It seems we can't fix this error until 3.10 is on Hackage, so let's close this obsolete PR.

@Mikolaj Mikolaj closed this Feb 24, 2023
@mergify mergify bot deleted the mergify/bp/3.10/pr-8754 branch February 24, 2023 13:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants