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

Bump versions and deps on master branch to 3.11 and regenerate bootstrap files (backport #8844) #8847

Closed
wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Mar 13, 2023

This is an automatic backport of pull request #8844 done by Mergify.
Cherry-pick of dfe7393 has failed:

On branch mergify/bp/3.10/pr-8844
Your branch is up to date with 'origin/3.10'.

You are currently cherry-picking commit dfe73930b.
  (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/validate.yml
	modified:   bootstrap/cabal.project

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   .github/workflows/bootstrap.yml
	both modified:   Cabal-QuickCheck/Cabal-QuickCheck.cabal
	both modified:   Cabal-described/Cabal-described.cabal
	both modified:   Cabal-syntax/Cabal-syntax.cabal
	both modified:   Cabal-tree-diff/Cabal-tree-diff.cabal
	both modified:   Cabal/Cabal.cabal
	both modified:   Cabal/Makefile
	both modified:   Makefile
	both modified:   bootstrap/cabal-bootstrap-gen.cabal
	both modified:   bootstrap/linux-8.10.7.json
	both modified:   bootstrap/linux-9.0.2.json
	both deleted:    bootstrap/linux-9.2.3.json
	added by us:     bootstrap/linux-9.2.6.json
	added by them:   bootstrap/linux-9.2.7.json
	both modified:   bootstrap/linux-9.4.4.json
	both modified:   cabal-install-solver/cabal-install-solver.cabal
	both modified:   cabal-install/cabal-install.cabal
	both modified:   cabal-install/src/Distribution/Client/Version.hs
	both modified:   cabal-testsuite/cabal-testsuite.cabal
	both modified:   doc/conf.py
	both modified:   solver-benchmarks/solver-benchmarks.cabal

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

…rap files (#8844)

* Bump versions on master branch to 3.11

* Try to fix CI by setting cabal-testsuite stable Cabal version to 3.8 back again

* Update bootstrap configuration

* Work around bounds problem with cabal-install-parsers

* Update bootstrap files

* Try to update the Custom setup cabal to 3.10 according to Artem's suggestion

* CI: cabal-3.10 compat: actions/cache has to go before cabal update

* Fix failing old GHC CI builds by adding XDG's ~/.local/bin to GITHUB_PATH

---------

Co-authored-by: Artem Pelenitsyn <a.pelenitsyn@gmail.com>
(cherry picked from commit dfe7393)

# Conflicts:
#	.github/workflows/bootstrap.yml
#	Cabal-QuickCheck/Cabal-QuickCheck.cabal
#	Cabal-described/Cabal-described.cabal
#	Cabal-syntax/Cabal-syntax.cabal
#	Cabal-tree-diff/Cabal-tree-diff.cabal
#	Cabal/Cabal.cabal
#	Cabal/Makefile
#	Makefile
#	bootstrap/cabal-bootstrap-gen.cabal
#	bootstrap/linux-8.10.7.json
#	bootstrap/linux-9.0.2.json
#	bootstrap/linux-9.2.3.json
#	bootstrap/linux-9.2.6.json
#	bootstrap/linux-9.2.7.json
#	bootstrap/linux-9.4.4.json
#	cabal-install-solver/cabal-install-solver.cabal
#	cabal-install/cabal-install.cabal
#	cabal-install/src/Distribution/Client/Version.hs
#	cabal-testsuite/cabal-testsuite.cabal
#	doc/conf.py
#	solver-benchmarks/solver-benchmarks.cabal
@Mikolaj
Copy link
Member

Mikolaj commented Mar 13, 2023

Actually, I only wanted to backport the bootstrap configuration changes, so I will need to do that by hand. Also, I will wait until @ulysses4ever figures out GHA caches in #8840 and so it gets fixed on master branch before backporting here bits of the boostrap stuff and CI fixes and the whole GHC 9.6.1 overhaul. Closing.

@Mikolaj Mikolaj closed this Mar 13, 2023
@mergify mergify bot deleted the mergify/bp/3.10/pr-8844 branch March 13, 2023 22:37
@Mikolaj
Copy link
Member

Mikolaj commented Apr 19, 2023

On a second thought, bootstraps are used from master branch, so let's keep them on 3.10 branch as is, unless they start failing CI.

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