diff options
| author | MSP-Greg <MSP-Greg@users.noreply.github.com> | 2020-03-16 18:54:44 -0500 |
|---|---|---|
| committer | MSP-Greg <MSP-Greg@users.noreply.github.com> | 2020-03-16 19:21:59 -0500 |
| commit | 2ded4e32dec54841e640da03ec1c1272831c2769 (patch) | |
| tree | d6857b043d82bb74882d25ba563c14f242702e6d | |
| parent | 2c43241dc0ed90062f160d24fc9fcae7bec86518 (diff) | |
| download | ruby-openssl-2ded4e32dec54841e640da03ec1c1272831c2769.tar.gz | |
Use setup-ruby-pkgs for Windows
1. Using correct MSYS compiler for Windows Ruby 2.3, previous CI used MSYS2
2. Ruby installation is done via a fork of setup-ruby
| -rw-r--r-- | .github/workflows/test.yml | 24 |
1 files changed, 6 insertions, 18 deletions
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index c8d24472..0c605315 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -43,31 +43,19 @@ jobs: - name: repo checkout uses: actions/checkout@v2 - - name: load ruby, update gcc, install openssl - uses: MSP-Greg/actions-ruby@mswin + - name: load ruby, install/update gcc, install openssl + uses: MSP-Greg/setup-ruby-pkgs@v1 with: ruby-version: ${{ matrix.ruby }} - base: update - mingw: openssl + mingw: _upgrade_ openssl - name: depends run: rake install_dependencies + # SSL_DIR is set as needed by MSP-Greg/setup-ruby-pkgs + # only used with mswin - name: compile - shell: cmd - env: - RVERS: ${{ matrix.ruby }} - run: | - if "%RVERS%" == "mswin" ( - call "%VCVARS%" - rake compile -- --with-openssl-dir=C:/openssl-win --enable-debug - ) else ( - if "%RVERS%" == "2.3" ( - rake compile -- --with-openssl-dir=C:/openssl-win --enable-debug - ) else ( - rake compile -- --enable-debug - ) - ) + run: rake compile -- --enable-debug $env:SSL_DIR - name: test run: rake test TESTOPTS="-v --no-show-detail-immediately" OSSL_MDEBUG=1 |