Use bootstrap project in bootstrapping #9990
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Mikolaj
approved these changes
May 8, 2024
geekosaur
approved these changes
May 8, 2024
sheaf
added
merge me
mergify
bot
added
the
merge delay passed
Mikolaj
force-pushed
the
bootstrap-project-1
branch
from
d26a5e0 to
b31f666
Compare
|
@mergify rebase |
❌ Unable to rebase: user
|
|
@mergify rebase |
✅ Branch has been successfully rebased |
ulysses4ever
force-pushed
the
bootstrap-project-1
branch
from
b31f666 to
9046b6f
Compare
|
@alt-romes Mergify is picky about accounts that can call commands like that, unfortunately. For a mere Rebase a non-admin user is better off with the GitHub UI, I think: there's an Update button usually, and if you click a dropdown menu button, you can change it from "merge master into feature branch" to "rebase feature on top of master" (not literally, but that's the meaning). |
We need to use the cabal.bootstrap.project file to generate the bootstrap plans, otherwise we try to include test components when bootstrapping, which is not useful (and significantly complicates bootstrapping).
Mikolaj
force-pushed
the
bootstrap-project-1
branch
from
9046b6f to
3c84288
Compare
geekosaur
added a commit
that referenced
this pull request
May 21, 2024
geekosaur
added a commit
that referenced
this pull request
May 21, 2024
mergify bot
added a commit
that referenced
this pull request
May 23, 2024
* Rename projects to cabal.*.project - Rename cabal.bootstrap.project - Rename cabal.meta.project - Rename cabal.validate-libonly.project - Rename cabal.validate.project - Rename cabal.release.project (cherry picked from commit d8147f6) # Conflicts: # .github/workflows/quick-jobs.yml # Makefile # cabal.bootstrap.project * Fix conflict with #9990 --------- Co-authored-by: Phil de Joux <philderbeast@gmail.com> Co-authored-by: brandon s allbery kf8nh <allbery.b@gmail.com> Co-authored-by: Artem Pelenitsyn <a.pelenitsyn@gmail.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
We need to use the cabal.bootstrap.project file to generate the bootstrap plans, otherwise we try to include test components when bootstrapping, which is not useful (and significantly complicates bootstrapping).
I forgot to include this change in 88737ef, but I used this change to generate the plans.
Template B: This PR does not modify behaviour or interface