Skip to content

Update README to list 9.6 properly (copy #2665)#2667

Merged
martijnbastiaan merged 1 commit into1.8from
mergify/copy/1.8/pr-2665
Feb 27, 2024
Merged

Update README to list 9.6 properly (copy #2665)#2667
martijnbastiaan merged 1 commit into1.8from
mergify/copy/1.8/pr-2665

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Feb 14, 2024

This is an automatic copy of pull request #2665 done by Mergify.
Cherry-pick of cb331a8 has failed:

On branch mergify/copy/1.8/pr-2665
Your branch is up to date with 'origin/1.8'.

You are currently cherry-picking commit cb331a852.
  (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/cabal.project.local
	new file:   .ci/find_cabal_bin.sh
	modified:   .ci/gitlab/test.yml
	new file:   .ci/stack-9.6.yaml
	modified:   clash-cores/clash-cores.cabal

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

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


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 Feb 14, 2024
Plus, test on 9.6 on Windows/macOS CI
@martijnbastiaan martijnbastiaan force-pushed the mergify/copy/1.8/pr-2665 branch from 4835bb9 to 1989c64 Compare February 27, 2024 20:18
@martijnbastiaan martijnbastiaan enabled auto-merge (squash) February 27, 2024 20:18
@martijnbastiaan martijnbastiaan merged commit f8914bc into 1.8 Feb 27, 2024
@martijnbastiaan martijnbastiaan deleted the mergify/copy/1.8/pr-2665 branch February 27, 2024 21:59
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