From 8df62d3ae86d63cb6a4b02dcc3266c899a40e369 Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Tue, 9 Aug 2022 14:36:15 +0000
Subject: [PATCH] Revert "Remove resolver=2 from Cargo.toml and add it to the
 Windows build" (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 2f6f5b11dae9389c92125b24b03fe07157aca8ed.

(cherry picked from commit ecda3bec018b4e1232fa5a05cf80e7c0238ec51b)

Co-authored-by: Ryo Onodera <ryoqun@gmail.com>
---
 Cargo.toml            | 3 +++
 ci/publish-tarball.sh | 5 -----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index ef847c1024a17d..9aad90aeb4f175 100644
--- 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
index 3b8b7b10df80f8..ef078f6636c0d5 100755
--- 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
   )
   ;;
 *)