Remove resolver=2 from Cargo.toml and add it to the Windows build #26706
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
…t resolver=2 for Windows builds.
yihau
reviewed
Jul 21, 2022
Comment on lines
64
to
68
| echo ${{ secrets.GITHUB_TOKEN }} | gh auth login --with-token | ||
| git config --global user.email "<>" | ||
| git config --global user.name "Github Action Bot" | ||
| git add -u | ||
| git commit -m "Add resolver=2" |
There was a problem hiding this comment.
maybe we don't want to commit here. ci/publish-tarball.sh creates a version.yml depends on the latest commit. if we do a new commit, I think it makes windows's version.yml will always different from linux and mac.
There was a problem hiding this comment.
Yeah good catch. I moved the logic into ci/publish-tarball.sh so it's after the git reset --hard
|
@willhickey @yihau how about backporting this to v1.10 branch? do you see any concerns? this pr has been in for awhile in master and causing no problem? as a context, I'm intending to ship #26555 to v1.10. |
|
just installed an edge bin on windows. I think it works fine. |
|
@willhickey @yihau oops. it looks like this pr isn't needed for #26555 actually. sorry. I'm reverting this. I was seeing odd error because, i.e. this works: # This prevents a Travis CI error when building for Windows.
resolver = "2"
+
+# for details, see https://github.com/solana-labs/crossbeam/commit/fd279d707025f0e60951e429bf778b4813d1b6bf
+[patch.crates-io]
+crossbeam-epoch = { git = "https://github.com/solana-labs/crossbeam", rev = "fd279d707025f0e60951e429bf778b4813d1b6bf" this won't: +
+# for details, see https://github.com/solana-labs/crossbeam/commit/fd279d707025f0e60951e429bf778b4813d1b6bf
+[patch.crates-io]
+crossbeam-epoch = { git = "https://github.com/solana-labs/crossbeam", rev = "fd279d707025f0e60951e429bf778b4813d1b6bf"
# This prevents a Travis CI error when building for Windows. <= Even this comment doesn't terminate the preceeding patch section parsing context...
resolver = "2" # <= this is now meaning to patch a non-existing crate called `resolver`... I'm dumb |
mergify bot
added a commit
that referenced
this pull request
Aug 9, 2022
…uild" (backport #27011) (#27019) Revert "Remove resolver=2 from Cargo.toml and add it to the Windows build" (#27011) Revert "Remove resolver=2 from Cargo.toml and add it to the Windows build (#26706)" This reverts commit 2f6f5b1. (cherry picked from commit ecda3be) Co-authored-by: Ryo Onodera <ryoqun@gmail.com>
mergify bot
added a commit
that referenced
this pull request
Aug 9, 2022
…uild" (backport #27011) (#27024) Revert "Remove resolver=2 from Cargo.toml and add it to the Windows build" (#27011) Revert "Remove resolver=2 from Cargo.toml and add it to the Windows build (#26706)" This reverts commit 2f6f5b1. (cherry picked from commit ecda3be) Co-authored-by: Ryo Onodera <ryoqun@gmail.com>
xiangzhu70
pushed a commit
to xiangzhu70/solana
that referenced
this pull request
Aug 17, 2022
…uild" (solana-labs#27011) Revert "Remove resolver=2 from Cargo.toml and add it to the Windows build (solana-labs#26706)" This reverts commit 2f6f5b1.
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.
See discussion on PR #26555
Problem
PR #24196 added
resolver = "2"to Cargo.toml. That fixed the broken Windows build but is causing other problems (see #22603)Summary of Changes
resolver = "2"from Cargo.tomlresolver = "2"to the local copy of Cargo.toml immediately before the build.context #22603