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

Revert "Remove resolver=2 from Cargo.toml and add it to the Windows build" #27011

Merged

Conversation

ryoqun
Copy link
Member

@ryoqun ryoqun commented Aug 9, 2022

My bad cargo skillz:

#26706 (comment)

@ryoqun ryoqun added automerge Merge this Pull Request automatically once CI passes v1.10 labels Aug 9, 2022
@ryoqun ryoqun marked this pull request as ready for review August 9, 2022 08:58
@ryoqun ryoqun merged commit ecda3be into master Aug 9, 2022
@ryoqun ryoqun deleted the revert-26706-whickey/move_resolver_2_to_windows_build branch August 9, 2022 08:58
mergify bot pushed a commit that referenced this pull request Aug 9, 2022
…uild" (#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)
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 <[email protected]>
@ryoqun ryoqun added the v1.11 label Aug 9, 2022
mergify bot pushed a commit that referenced this pull request Aug 9, 2022
…uild" (#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)
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 <[email protected]>
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
Labels
automerge Merge this Pull Request automatically once CI passes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant