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

Clean cabal project (backport #2097) #2110

Merged
merged 2 commits into from
Aug 18, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 18, 2021

This is an automatic backport of pull request #2097 done by Mergify.
Cherry-pick of 57ffd74 has failed:

On branch mergify/bp/1.3.0-hackage/pr-2097
Your branch is up to date with 'origin/1.3.0-hackage'.

You are currently cherry-picking commit 57ffd744.
  (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:   ghcide/ghcide.cabal
	modified:   stack-8.10.2.yaml
	modified:   stack-8.10.3.yaml
	modified:   stack-8.10.4.yaml
	modified:   stack-8.10.5.yaml
	modified:   stack-8.6.4.yaml
	modified:   stack-8.6.5.yaml
	modified:   stack-8.8.3.yaml
	modified:   stack-8.8.4.yaml
	modified:   stack-9.0.1.yaml
	modified:   stack.yaml

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   cabal.project

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.io/

* Remove superflous things

* Set index-state

* Add ghc-api-compat and remove shake-bench

* Correct comment about ghc-api-compat

* Add specific project file for benchs

* Use specific project file for benchmarks

* Ensure we use lsp-1.3.0.1

* Use lsp-types-1.3.0.1 for stack

* Use lsp-types-1.3.0.1 for default stack

* Remove some more allow-newer

* Use one cabal.project

Co-authored-by: Pepe Iborra <[email protected]>
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
(cherry picked from commit 57ffd74)

# Conflicts:
#	cabal.project
@mergify mergify bot added the conflicts label Aug 18, 2021
@mergify mergify bot mentioned this pull request Aug 18, 2021
@jneira jneira added merge me Label to trigger pull request merge and removed conflicts labels Aug 18, 2021
Copy link
Member

@jneira jneira left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

auto+1

@mergify mergify bot merged commit e93f0fd into 1.3.0-hackage Aug 18, 2021
@mergify mergify bot deleted the mergify/bp/1.3.0-hackage/pr-2097 branch August 18, 2021 09:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merge me Label to trigger pull request merge
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant