From c0118289efbd3d0c61ae8912426a211e53abe208 Mon Sep 17 00:00:00 2001
From: danakj <danakj@chromium.org>
Date: Wed, 15 Sep 2021 13:37:22 -0400
Subject: [PATCH] Disable both reproducible-build tests for crate-type=bin

These tests fail on Windows, as the build is not deterministic there for
bin targets.

Issue https://github.com/rust-lang/rust/issues/88982 is filed for this
problem.
---
 .github/workflows/ci.yml                               | 5 -----
 src/ci/github-actions/ci.yml                           | 5 -----
 src/test/run-make-fulldeps/reproducible-build/Makefile | 9 +++++----
 3 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 76318ab7cb92..ff4fa1527e93 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -534,11 +534,6 @@ jobs:
     strategy:
       matrix:
         include:
-          - name: x86_64-msvc-1
-            env:
-              RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-msvc --enable-profiler"
-              SCRIPT: make ci-subset-1
-            os: windows-latest-xl
           - name: dist-x86_64-linux
             os: ubuntu-latest-xl
             env: {}
diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml
index e4c402b417e6..6417f5a984ad 100644
--- a/src/ci/github-actions/ci.yml
+++ b/src/ci/github-actions/ci.yml
@@ -668,11 +668,6 @@ jobs:
     strategy:
       matrix:
         include:
-          - name: x86_64-msvc-1
-            env:
-              RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --enable-profiler
-              SCRIPT: make ci-subset-1
-            <<: *job-windows-xl
           - *dist-x86_64-linux
 
   master:
diff --git a/src/test/run-make-fulldeps/reproducible-build/Makefile b/src/test/run-make-fulldeps/reproducible-build/Makefile
index 46885fdb7df8..adccc1535684 100644
--- a/src/test/run-make-fulldeps/reproducible-build/Makefile
+++ b/src/test/run-make-fulldeps/reproducible-build/Makefile
@@ -9,15 +9,16 @@ all:  \
 	opt \
 	link_paths \
 	remap_paths \
-	different_source_dirs_bin \
 	different_source_dirs_rlib \
 	remap_cwd_rlib \
 	remap_cwd_to_empty \
 	extern_flags
 
-# TODO: Deterministic builds of `bin` crate types are not deterministic with
-# debuginfo=2 on Windows.
-# See https://github.com/rust-lang/rust/pull/87320#issuecomment-920105533
+# TODO: Builds of `bin` crate types are not deterministic with debuginfo=2 on
+# Windows.
+# See: https://github.com/rust-lang/rust/pull/87320#issuecomment-920105533
+# Issue: https://github.com/rust-lang/rust/issues/88982
+#
 #	different_source_dirs_bin \
 #	remap_cwd_bin \