Skip to content

Commit 2ded4e3

Browse files
committed
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
1 parent 2c43241 commit 2ded4e3

File tree

1 file changed

+6
-18
lines changed

1 file changed

+6
-18
lines changed

.github/workflows/test.yml

Lines changed: 6 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -43,31 +43,19 @@ jobs:
4343
- name: repo checkout
4444
uses: actions/checkout@v2
4545

46-
- name: load ruby, update gcc, install openssl
47-
uses: MSP-Greg/actions-ruby@mswin
46+
- name: load ruby, install/update gcc, install openssl
47+
uses: MSP-Greg/setup-ruby-pkgs@v1
4848
with:
4949
ruby-version: ${{ matrix.ruby }}
50-
base: update
51-
mingw: openssl
50+
mingw: _upgrade_ openssl
5251

5352
- name: depends
5453
run: rake install_dependencies
5554

55+
# SSL_DIR is set as needed by MSP-Greg/setup-ruby-pkgs
56+
# only used with mswin
5657
- name: compile
57-
shell: cmd
58-
env:
59-
RVERS: ${{ matrix.ruby }}
60-
run: |
61-
if "%RVERS%" == "mswin" (
62-
call "%VCVARS%"
63-
rake compile -- --with-openssl-dir=C:/openssl-win --enable-debug
64-
) else (
65-
if "%RVERS%" == "2.3" (
66-
rake compile -- --with-openssl-dir=C:/openssl-win --enable-debug
67-
) else (
68-
rake compile -- --enable-debug
69-
)
70-
)
58+
run: rake compile -- --enable-debug $env:SSL_DIR
7159

7260
- name: test
7361
run: rake test TESTOPTS="-v --no-show-detail-immediately" OSSL_MDEBUG=1

0 commit comments

Comments
 (0)