https://git.ruby-lang.org/ruby.git/commit/?id=76e8cfd158

From 76e8cfd1588e5a787f579063d66cba001e54380a Mon Sep 17 00:00:00 2001
From: Nobuyoshi Nakada <nobu@r...>
Date: Thu, 26 Aug 2021 01:01:53 +0900
Subject: [Windows CI] Setup env

---
 .github/workflows/windows.yml | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index 495789f..6f2e237 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -66,13 +66,22 @@ jobs: https://github.com/ruby/ruby/blob/trunk/.github/workflows/windows.yml#L66
       - uses: actions/checkout@v2
         with:
           path: src
-      - name: Configure
+      - name: setup env
+        # %TEMP% is inconsistent with %TMP% and test-all expects they are consistent.
+        # https://github.com/actions/virtual-environments/issues/712#issuecomment-613004302
         run: |
+          set | C:\msys64\usr\bin\sort > old.env
           call %VCVARS%
+          set TMP=%USERPROFILE%\AppData\Local\Temp
+          set TEMP=%USERPROFILE%\AppData\Local\Temp
+          set | C:\msys64\usr\bin\sort > new.env
+          C:\msys64\usr\bin\comm -13 old.env new.env >> %GITHUB_ENV%
+          del *.env
+      - name: Configure
+        run: |
           ../src/win32/configure.bat --disable-install-doc --enable-bundled-libffi --with-opt-dir=C:/vcpkg/installed/x64-windows --with-openssl-dir="C:/Program Files/OpenSSL-Win64"
       - name: nmake
         run: |
-          call %VCVARS%
           echo ^#^#[group]incs
           nmake incs
           echo ^#^#[endgroup]
@@ -85,22 +94,15 @@ jobs: https://github.com/ruby/ruby/blob/trunk/.github/workflows/windows.yml#L94
       - name: nmake test
         timeout-minutes: 5
         run: |
-          call %VCVARS%
           nmake test
       - name: nmake test-all
         timeout-minutes: 60
         run: |
-          call %VCVARS%
-          ::- %TEMP% is inconsistent with %TMP% and test-all expects they are consistent.
-          ::- https://github.com/actions/virtual-environments/issues/712#issuecomment-613004302
-          set TMP=%USERPROFILE%\AppData\Local\Temp
-          set TEMP=%USERPROFILE%\AppData\Local\Temp
           nmake test-all TESTOPTS="-j%NUMBER_OF_PROCESSORS% --job-status=normal"
         continue-on-error: ${{ matrix.continue-on-error }}
       - name: nmake test-spec
         timeout-minutes: 10
         run: |
-          call %VCVARS%
           nmake test-spec
         continue-on-error: ${{ matrix.continue-on-error }}
       - uses: k0kubun/action-slack@v...
-- 
cgit v1.1


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/