ruby-changes:63337
From: Nobuyoshi <ko1@a...>
Date: Tue, 13 Oct 2020 14:17:15 +0900 (JST)
Subject: [ruby-changes:63337] a75ab110df (master): Use %VCVARS%
https://git.ruby-lang.org/ruby.git/commit/?id=a75ab110df From a75ab110dfacf8f8e175657ee433de1320e2a7da Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada <nobu@r...> Date: Mon, 12 Oct 2020 16:22:30 +0900 Subject: Use %VCVARS% diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 3281727..0ae5379 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -11,6 +11,7 @@ jobs: https://github.com/ruby/ruby/blob/trunk/.github/workflows/windows.yml#L11 runs-on: ${{ matrix.os }} env: GITPULLOPTIONS: --no-tags origin ${{github.ref}} + VCVARS: C:\Program Files (x86)\Microsoft Visual Studio\${{ matrix.vs }}\Enterprise\VC\Auxiliary\Build\vcvars64.bat if: "!contains(github.event.head_commit.message, '[ci skip]')" steps: - uses: actions/cache@v2 @@ -44,13 +45,13 @@ jobs: https://github.com/ruby/ruby/blob/trunk/.github/workflows/windows.yml#L45 shell: cmd - name: Configure run: | - call "C:\Program Files (x86)\Microsoft Visual Studio\${{ matrix.vs }}\Enterprise\VC\Auxiliary\Build\vcvars64.bat" + call "%VCVARS%" ../src/win32/configure.bat --disable-install-doc --without-ext=+,dbm,gdbm --enable-bundled-libffi --with-opt-dir=C:/vcpkg/installed/x64-windows --with-openssl-dir="C:/Program Files/OpenSSL-Win64" working-directory: build shell: cmd - name: nmake run: | - call "C:\Program Files (x86)\Microsoft Visual Studio\${{ matrix.vs }}\Enterprise\VC\Auxiliary\Build\vcvars64.bat" + call "%VCVARS%" set YACC=win_bison echo on nmake incs @@ -61,7 +62,7 @@ jobs: https://github.com/ruby/ruby/blob/trunk/.github/workflows/windows.yml#L62 - name: nmake test timeout-minutes: 30 run: | - call "C:\Program Files (x86)\Microsoft Visual Studio\${{ matrix.vs }}\Enterprise\VC\Auxiliary\Build\vcvars64.bat" + call "%VCVARS%" nmake ${{ matrix.test_task }} working-directory: build shell: cmd -- cgit v0.10.2 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/