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

Add support for GHC 9.8.4 (copy #2860) #2862

Merged
merged 3 commits into from
Jan 3, 2025
Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 2, 2025

Fixes #2852

Still TODO:

  • Write a changelog entry (see changelog/README.md)
  • Check copyright notices are up to date in edited files

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

@mergify mergify bot added the conflicts label Jan 2, 2025
Copy link
Contributor Author

mergify bot commented Jan 2, 2025

Cherry-pick of de938a1 has failed:

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

You are currently cherry-picking commit de938a14.
  (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:   .ci/docker/Dockerfile
	modified:   .ci/stack-9.8.yaml
	modified:   .gitlab-ci.yml

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   .ci/docker/build-and-publish-docker-image.sh
	both modified:   .ci/gitlab/benchmark.yml
	both modified:   .ci/gitlab/common.yml
	both modified:   .github/workflows/ci.yml

Cherry-pick of ccc6daa has failed:

On branch mergify/copy/1.8/pr-2860
Your branch is ahead of 'origin/1.8' by 2 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit ccc6daa0.
  (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:   .ci/gitlab/test.yml
	modified:   .gitlab-ci.yml
	modified:   clash-ffi/clash-ffi.cabal

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   .ci/build.sh

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

@christiaanb christiaanb force-pushed the mergify/copy/1.8/pr-2860 branch from 5fe0f92 to e839310 Compare January 2, 2025 16:40
@christiaanb christiaanb force-pushed the mergify/copy/1.8/pr-2860 branch from e839310 to fdba719 Compare January 2, 2025 16:56
@christiaanb christiaanb enabled auto-merge January 2, 2025 17:03
@christiaanb christiaanb merged commit c639ace into 1.8 Jan 3, 2025
17 checks passed
@christiaanb christiaanb deleted the mergify/copy/1.8/pr-2860 branch January 3, 2025 08:28
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.

1 participant