Skip to content

Commit 417c1ab

Browse files
authored
Merge pull request ruby#514 from MSP-Greg/00-ci-openssl-3
[CI] add Ubuntu-22.04 and update mswin, all are OpenSSL 3
2 parents 553b328 + 0fb8d1b commit 417c1ab

File tree

1 file changed

+5
-33
lines changed

1 file changed

+5
-33
lines changed

.github/workflows/test.yml

Lines changed: 5 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,12 @@ jobs:
1010
strategy:
1111
fail-fast: false
1212
matrix:
13-
os: [ ubuntu-latest, macos-latest ]
13+
os: [ ubuntu-latest, macos-latest, windows-latest ]
1414
ruby: [ head, "3.1", "3.0", "2.7", "2.6" ]
15+
include:
16+
- { os: windows-latest, ruby: mswin }
17+
- { os: ubuntu-22.04, ruby: head }
18+
- { os: ubuntu-22.04, ruby: "3.1" }
1519
steps:
1620
- name: repo checkout
1721
uses: actions/checkout@v3
@@ -30,38 +34,6 @@ jobs:
3034
- name: test
3135
run: rake test TESTOPTS="-v --no-show-detail-immediately" OSSL_MDEBUG=1
3236

33-
test-windows:
34-
name: >-
35-
${{ matrix.os }} ${{ matrix.ruby }}
36-
runs-on: ${{ matrix.os }}
37-
strategy:
38-
fail-fast: false
39-
matrix:
40-
os: [ windows-latest ]
41-
ruby: [ mswin, mingw, "3.1", "3.0", "2.7", "2.6" ]
42-
steps:
43-
- name: repo checkout
44-
uses: actions/checkout@v3
45-
46-
- name: load ruby, install/update gcc, install openssl
47-
uses: MSP-Greg/setup-ruby-pkgs@v1
48-
with:
49-
ruby-version: ${{ matrix.ruby }}
50-
mingw: ${{ matrix.ruby != 'mswin' && '_upgrade_ openssl' || '' }}
51-
vcpkg: ${{ matrix.ruby == 'mswin' && 'openssl' || '' }}
52-
53-
- name: depends
54-
run: bundle install
55-
56-
# pkg-config is disabled because it can pick up the different OpenSSL installation
57-
# SSL_DIR is set as needed by MSP-Greg/setup-ruby-pkgs
58-
# only used with mswin
59-
- name: compile
60-
run: rake compile -- --enable-debug --without-pkg-config $env:SSL_DIR
61-
62-
- name: test
63-
run: rake test TESTOPTS="-v --no-show-detail-immediately" OSSL_MDEBUG=1
64-
6537
test-openssls:
6638
name: >-
6739
${{ matrix.openssl }}

0 commit comments

Comments
 (0)