diff options
author | Nobuyoshi Nakada <nobu@ruby-lang.org> | 2020-10-12 16:22:30 +0900 |
---|---|---|
committer | Nobuyoshi Nakada <nobu@ruby-lang.org> | 2020-10-13 14:16:29 +0900 |
commit | a75ab110dfacf8f8e175657ee433de1320e2a7da (patch) | |
tree | fac9cb0626b2255f716dc84bbb624f58626dc85c /.github | |
parent | 10e09ccaff057fd712838366afd21fdffa2e54c7 (diff) |
Use %VCVARS%
Diffstat (limited to '.github')
-rw-r--r-- | .github/workflows/windows.yml | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 32817279d3..0ae537959a 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -11,6 +11,7 @@ jobs: 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: 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: - 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 |