aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKazuki Yamaguchi <k@rhe.jp>2020-03-31 19:25:01 +0900
committerGitHub <noreply@github.com>2020-03-31 19:25:01 +0900
commit1f1641d71f8f84eeb410a8c8c1b5010ab5c49dd6 (patch)
treec0b453ca8732fa1e0d7968b744f3ddc08362b417
parent0d15901b86ca2cecac5229daff730d00ee2429a9 (diff)
parent2ded4e32dec54841e640da03ec1c1272831c2769 (diff)
downloadruby-openssl-1f1641d71f8f84eeb410a8c8c1b5010ab5c49dd6.tar.gz
Merge pull request #354 from MSP-Greg/setup-ruby-pkgs
Use setup-ruby-pkgs for Windows
-rw-r--r--.github/workflows/test.yml24
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