diff options
| author | Hiroshi SHIBATA <hsbt@ruby-lang.org> | 2019-08-12 18:56:01 +0900 |
|---|---|---|
| committer | Hiroshi SHIBATA <hsbt@ruby-lang.org> | 2019-08-12 20:11:49 +0900 |
| commit | 0fd0f74508e1b6d26605a85066e18a4d00a02d84 (patch) | |
| tree | 7aee9c8b43bb50a5bb90cb55af9dd76ac0034904 /.github | |
| parent | 040bf4c0a69cfcc4df6250f0241b9c7cc4a42ab6 (diff) | |
| download | ruby-0fd0f74508e1b6d26605a85066e18a4d00a02d84.tar.gz | |
Try to merge windows 2016 and 2019
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/windows-2019.yml | 35 | ||||
| -rw-r--r-- | .github/workflows/windows.yml (renamed from .github/workflows/windows-2016.yml) | 17 |
2 files changed, 13 insertions, 39 deletions
diff --git a/.github/workflows/windows-2019.yml b/.github/workflows/windows-2019.yml deleted file mode 100644 index c1cea4bc51..0000000000 --- a/.github/workflows/windows-2019.yml +++ /dev/null @@ -1,35 +0,0 @@ -name: windows-2019 -on: - push: - branches: - - master - pull_request: - branches: - - '*' -jobs: - latest: - runs-on: windows-2019 - steps: - - name: Install libraries with vcpkg - run: | - vcpkg --triplet x64-windows install %dependencies% || ( - sleep 4 && vcpkg --triplet x64-windows install %dependencies% - ) || ( - sleep 25 && vcpkg --triplet x64-windows install %dependencies% - ) - env: - dependencies: openssl readline zlib - - name: Install libraries with chocolatey - run: choco install winflexbison3 - - name: Checkout # not using actions/checkout because it's unstable. - run: git clone --depth=50 https://github.com/ruby/ruby . - - name: configure - run: | - call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat" - win32/configure.bat --without-ext=+,dbm,gdbm --enable-bundled-libffi --with-opt-dir=C:/vcpkg/installed/x64-windows - - name: nmake - run: | - call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat" - set YACC=win_bison - nmake up - nmake diff --git a/.github/workflows/windows-2016.yml b/.github/workflows/windows.yml index e211641c02..665d33a0e6 100644 --- a/.github/workflows/windows-2016.yml +++ b/.github/workflows/windows.yml @@ -1,4 +1,4 @@ -name: windows-2016 +name: windows on: push: branches: @@ -8,7 +8,16 @@ on: - '*' jobs: latest: - runs-on: windows-2016 + strategy: + matrix: + os: [windows-2016, windows-2019] + vs: [2017, 2019] + exclude: + - os: windows-2016 + vs: 2019 + - os: windows-2019 + vs: 2017 + runs-on: ${{ matrix.os }} steps: - name: Install libraries with vcpkg run: | @@ -25,11 +34,11 @@ jobs: run: git clone --depth=50 https://github.com/ruby/ruby . - name: configure run: | - call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvars64.bat" + call "C:\Program Files (x86)\Microsoft Visual Studio\${{ matrix.vs }}\Enterprise\VC\Auxiliary\Build\vcvars64.bat" win32/configure.bat --without-ext=+,dbm,gdbm --enable-bundled-libffi --with-opt-dir=C:/vcpkg/installed/x64-windows - name: nmake run: | - call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvars64.bat" + call "C:\Program Files (x86)\Microsoft Visual Studio\${{ matrix.vs }}\Enterprise\VC\Auxiliary\Build\vcvars64.bat" set YACC=win_bison nmake up nmake |