You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
In #2018 I temporarily removed what was not touching cmake as it was not needed at the time, and this was conflicting with branches I used to test #2018 (2018 includes preparatory work so I had to test it worked).
I now rebased all the branches that would have conflicted with that.
The commit message is the sentence from the original commit that described that specific part of the patch.
This is already reviewed by me and approved, so @slipher can merge anytime he wants to.
This changes the way a rebuilt deps 11 version is done, and then such rebuilt deps would not fit to rebuild a last-release engine, but it works with the master branch, and rebuilding a last-release archive can use the already built deps.
The alternative would be to bump first but then some bumping commit may precede what will change again. As long as releases can build and master can build, it is fine.
The commit message is the sentence from the original commit that described that specific part of the patch.
I think with that sentence I was describing both the build.sh change, and the CMake changes to stop copying that file. With the remaining part I might describe it as "Deps: don't package amd64 nacl_bootstrap"
This changes the way a rebuilt deps 11 version is done, and then such rebuilt deps would not fit to rebuild a last-release engine, but it works with the master branch, and rebuilding a last-release archive can use the already built deps.
Right, that's how I see it. The two guarantees should be that the engine works with the version that it auto-downloads, and that it works with building the current version of the script from scratch. Being able to overwrite the published version of the deps is a non-goal.
This file contains hidden or 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
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.
This was part of:
Especially that commit:
It had been temporarily put aside when testing and merging:
In #2018 I temporarily removed what was not touching cmake as it was not needed at the time, and this was conflicting with branches I used to test #2018 (2018 includes preparatory work so I had to test it worked).
I now rebased all the branches that would have conflicted with that.
The commit message is the sentence from the original commit that described that specific part of the patch.
This is already reviewed by me and approved, so @slipher can merge anytime he wants to.
This changes the way a rebuilt deps 11 version is done, and then such rebuilt deps would not fit to rebuild a last-release engine, but it works with the master branch, and rebuilding a last-release archive can use the already built deps.
The alternative would be to bump first but then some bumping commit may precede what will change again. As long as releases can build and
mastercan build, it is fine.