about summary refs log tree commit diff
diff options
context:
space:
mode:
authorMatthias Krüger <matthias.krueger@famsik.de>2021-12-28 13:59:23 +0100
committerGitHub <noreply@github.com>2021-12-28 13:59:23 +0100
commitf1598edc3f8f249b5b2e84135f91a3dbda4d7565 (patch)
treee0d46e7202ac4e9c93b787aec6ac5474cf226d22
parentbec499e08d91a61942e01ac2a747c285e48da2fd (diff)
parent4bbbdb7f459c72f02bf4b204c2ebad8fc7cd9b0c (diff)
downloadrust-f1598edc3f8f249b5b2e84135f91a3dbda4d7565.tar.gz
rust-f1598edc3f8f249b5b2e84135f91a3dbda4d7565.zip
Rollup merge of #92219 - ehuss:remove-vcvars, r=Mark-Simulacrum
Remove VCVARS_BAT

This environment variable is no longer used.  It was used in the original Azure Pipelines configuration (#60777). When GitHub Actions were added (#70190), it was no longer used, and I suspect it was just an oversight while transitioning the configuration.
-rw-r--r--.github/workflows/ci.yml1
-rw-r--r--src/ci/github-actions/ci.yml1
2 files changed, 0 insertions, 2 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index fd015e1cd43..67deb3d9779 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -355,7 +355,6 @@ jobs:
             env:
               SCRIPT: python x.py --stage 2 test src/tools/cargotest src/tools/cargo
               RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-msvc --enable-lld"
-              VCVARS_BAT: vcvars64.bat
             os: windows-latest-xl
           - name: x86_64-msvc-tools
             env:
diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml
index 96af401369e..ac5d5822bfb 100644
--- a/src/ci/github-actions/ci.yml
+++ b/src/ci/github-actions/ci.yml
@@ -548,7 +548,6 @@ jobs:
             env:
               SCRIPT: python x.py --stage 2 test src/tools/cargotest src/tools/cargo
               RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --enable-lld
-              VCVARS_BAT: vcvars64.bat
             <<: *job-windows-xl
 
           - name: x86_64-msvc-tools