1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

Try to merge windows 2016 and 2019

This commit is contained in:
Hiroshi SHIBATA 2019-08-12 18:56:01 +09:00
parent 040bf4c0a6
commit 0fd0f74508
No known key found for this signature in database
GPG key ID: F9CF13417264FAC2
2 changed files with 13 additions and 39 deletions

View file

@ -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

View file

@ -1,4 +1,4 @@
name: windows-2016 name: windows
on: on:
push: push:
branches: branches:
@ -8,7 +8,16 @@ on:
- '*' - '*'
jobs: jobs:
latest: 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: steps:
- name: Install libraries with vcpkg - name: Install libraries with vcpkg
run: | run: |
@ -25,11 +34,11 @@ jobs:
run: git clone --depth=50 https://github.com/ruby/ruby . run: git clone --depth=50 https://github.com/ruby/ruby .
- name: configure - name: configure
run: | 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 win32/configure.bat --without-ext=+,dbm,gdbm --enable-bundled-libffi --with-opt-dir=C:/vcpkg/installed/x64-windows
- name: nmake - name: nmake
run: | 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 set YACC=win_bison
nmake up nmake up
nmake nmake