Revert "Remove resolver=2 from Cargo.toml and add it to the Windows b…

…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]>
solana-labs · Aug 9, 2022 · 8df62d3 · 8df62d3
1 parent 49ef6be
commit 8df62d3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -91,3 +91,6 @@ members = [
 exclude = [
     "programs/bpf",
 ]
+
+# This prevents a Travis CI error when building for Windows.
+resolver = "2"
diff --git a/ci/publish-tarball.sh b/ci/publish-tarball.sh
@@ -58,11 +58,6 @@ windows)
     git config core.symlinks true
     find . -type l -delete
     git reset --hard
-    # The Windows build fails without resolver = "2", but including it in Cargo.toml causes
-    # other problems (see PR #26555 and Issue #22603). This adds resolver = "2" to
-    # Cargo.toml before building. Since the build environment does not persist the changes
-    # are discarded after the build and do not interfere with non-Windows builds.
-    echo 'resolver = "2"' >> Cargo.toml
   )
   ;;
 *)