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

Simplify Stack CI (copy #2579) #2580

Merged
merged 1 commit into from
Sep 22, 2023
Merged

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Sep 21, 2023

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

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

You are currently cherry-picking commit bf71dcdb5.
  (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/rm <file>..." as appropriate to mark resolution)
	deleted by us:   .ci/stack-9.2.yaml
	deleted by us:   .ci/stack-9.4.yaml
	both modified:   .github/workflows/ci.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/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

@mergify mergify bot added the conflicts label Sep 21, 2023
For Stack CI, GHC doesn't need to be installed globally; only the
version installed by Stack is actually used.

Also bump to the latest LTS'es

Fix running of bash snippets/scripts in GitHub Stack CI
@DigitalBrains1 DigitalBrains1 merged commit f6d0fdb into 1.6 Sep 22, 2023
8 checks passed
@DigitalBrains1 DigitalBrains1 deleted the mergify/copy/1.6/pr-2579 branch September 22, 2023 14:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants