Skip to content

Depend on tar-0.6.3.0 (backport #10120) #10123

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

Merged
merged 4 commits into from
Jun 18, 2024
Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jun 18, 2024

tar-0.6.3.0 has much improved performance of deserialising .tar index
which has significant ramifications for the start-up time of
cabal-install.

See #10110


This is an automatic backport of pull request #10120 done by Mergify.

tar-0.6.3.0 has much improved performance of deserialising .tar index
which has significant ramifications for the start-up time of
cabal-install.

See #10110

(cherry picked from commit 827256a)
Using the updated version of this library improves performance of
cabal-install so it's worthwhile to make sure the bootstrap plans use
this version.

(cherry picked from commit 4d787e1)

# Conflicts:
#	bootstrap/linux-8.10.7.json
#	bootstrap/linux-9.0.2.json
#	bootstrap/linux-9.2.8.json
#	bootstrap/linux-9.4.8.json
#	bootstrap/linux-9.6.4.json
#	bootstrap/linux-9.8.2.json
@mergify mergify bot added the conflicts label Jun 18, 2024
Copy link
Contributor Author

mergify bot commented Jun 18, 2024

Cherry-pick of 4d787e1 has failed:

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

You are currently cherry-picking commit 4d787e1b5.
  (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:   bootstrap/generate_bootstrap_plans
	modified:   cabal.bootstrap.project

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   bootstrap/linux-8.10.7.json
	both modified:   bootstrap/linux-9.0.2.json
	both modified:   bootstrap/linux-9.2.8.json
	both modified:   bootstrap/linux-9.4.8.json
	both modified:   bootstrap/linux-9.6.4.json
	both modified:   bootstrap/linux-9.8.2.json

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 mergify bot mentioned this pull request Jun 18, 2024
@mergify mergify bot added the backport label Jun 18, 2024
@Mikolaj Mikolaj added the merge me Tell Mergify Bot to merge label Jun 18, 2024
@geekosaur geekosaur force-pushed the mergify/bp/3.12/pr-10120 branch 4 times, most recently from a4c6852 to 46c46f7 Compare June 18, 2024 17:29
@ulysses4ever ulysses4ever added squash+merge me Tell Mergify Bot to squash-merge and removed merge me Tell Mergify Bot to merge labels Jun 18, 2024
@mergify mergify bot merged commit f54d0dc into 3.12 Jun 18, 2024
52 checks passed
@mergify mergify bot deleted the mergify/bp/3.12/pr-10120 branch June 18, 2024 21:51
@ulysses4ever ulysses4ever mentioned this pull request Jun 19, 2024
2 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport squash+merge me Tell Mergify Bot to squash-merge
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants