Skip to content

Commit 8434d9a

Browse files
authored
Merge pull request #437 from radiator-software/gh-436-ci-enhancements
Gh 436 CI enhancements
2 parents 936aca5 + 14c0733 commit 8434d9a

File tree

3 files changed

+49
-18
lines changed

3 files changed

+49
-18
lines changed

.github/workflows/ci.yml

Lines changed: 43 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,16 @@
11
# The CI workflow tests Net-SSLeay against the following setups:
22
#
33
# - OS: Ubuntu 20.04
4-
#
54
# - Perl: the latest patch release of every minor release since 5.8
6-
#
75
# - libssl: the latest patch release of every minor release between:
8-
# - OpenSSL: 0.9.8 and 3.0
9-
# - LibreSSL: 2.2 and 3.6
6+
# - OpenSSL: 0.9.8 and 3.1
7+
# - LibreSSL: 2.2 and 3.7
8+
#
9+
# - Non-x86 architectures on Alpine Linux and Ubuntu
10+
#
11+
# - Various BSDs with different LibreSSL and OpenSSL versions
12+
#
13+
# - Windows with Cygwin
1014

1115
name: CI
1216

@@ -46,8 +50,9 @@ jobs:
4650
- '5.10'
4751
- '5.8'
4852
openssl:
49-
- '3.0.8'
50-
- '1.1.1t'
53+
- '3.1.1'
54+
- '3.0.9'
55+
- '1.1.1u'
5156
- '1.1.0l'
5257
- '1.0.2u'
5358
- '1.0.1u'
@@ -112,7 +117,8 @@ jobs:
112117
- '5.10'
113118
- '5.8'
114119
libressl:
115-
- '3.6.2'
120+
- '3.7.3'
121+
- '3.6.3'
116122
- '3.5.4'
117123
- '3.4.3'
118124
- '3.3.6'
@@ -164,7 +170,7 @@ jobs:
164170
make test
165171
166172
non_x86_alpine:
167-
name: "${{ matrix.platform }}/Alpine (${{ matrix.package }})"
173+
name: "${{ matrix.platform }}/Alpine/${{ matrix.alpine_version }} (${{ matrix.package }})"
168174

169175
runs-on: ubuntu-latest
170176

@@ -179,6 +185,15 @@ jobs:
179185
- arm32v6
180186
- arm32v7
181187
- arm64v8
188+
alpine_version:
189+
- '3.18'
190+
- '3.17'
191+
- '3.16'
192+
- '3.15'
193+
exclude:
194+
- package: libressl
195+
platform: s390x
196+
alpine_version: '3.18'
182197

183198
steps:
184199
- uses: actions/checkout@main
@@ -189,7 +204,7 @@ jobs:
189204

190205
# NB: “openssl” is correct, even for LibreSSL:
191206
- name: Run tests on ${{ matrix.platform }}
192-
run: docker run --rm --interactive --mount type=bind,source=$(pwd),target=/host ${{ matrix.platform }}/alpine sh -c "apk add perl-dev perl-app-cpanminus make gcc musl-dev zlib-dev ${{ matrix.package }}-dev openssl && perl -V && cd /host && cpanm --verbose --notest --installdeps . && perl Makefile.PL && make test"
207+
run: docker run --rm --interactive --mount type=bind,source=$(pwd),target=/host ${{ matrix.platform }}/alpine:${{ matrix.alpine_version}} sh -c "apk add perl-dev perl-app-cpanminus make gcc musl-dev zlib-dev ${{ matrix.package }}-dev openssl && perl -V && cd /host && cpanm --verbose --notest --installdeps . && perl Makefile.PL && make test"
193208

194209
non_x86_ubuntu:
195210
name: "${{ matrix.platform }}/Ubuntu"
@@ -214,7 +229,7 @@ jobs:
214229
run: docker run --rm --interactive --mount type=bind,source=$(pwd),target=/host ${{ matrix.platform }}/ubuntu bash -c "apt update && apt install -y cpanminus make gcc openssl libssl-dev zlib1g-dev && perl -V && cd /host && cpanm --notest --verbose --installdeps . || find /root/.cpanm/work/ -type f | xargs cat; perl Makefile.PL && make test"
215230

216231
BSDs:
217-
runs-on: macos-10.15
232+
runs-on: macos-12
218233

219234
name: ${{ matrix.os.pretty_name }} ${{ matrix.os.version }}
220235

@@ -223,21 +238,33 @@ jobs:
223238
matrix:
224239
os:
225240
- name: freebsd
226-
pretty_name: FreeBSD (OpenSSL)
227-
version: '13.0'
228-
pkginstall: pkg install -y p5-ExtUtils-MakeMaker p5-App-cpanminus openssl openssl-devel
241+
pretty_name: FreeBSD (OpenSSL default)
242+
version: '13.2'
243+
pkginstall: pkg install -y p5-ExtUtils-MakeMaker p5-App-cpanminus
244+
- name: freebsd
245+
pretty_name: FreeBSD (OpenSSL 3.0)
246+
version: '13.2'
247+
pkginstall: pkg install -y p5-ExtUtils-MakeMaker p5-App-cpanminus openssl30
248+
- name: freebsd
249+
pretty_name: FreeBSD (OpenSSL 3.1)
250+
version: '13.2'
251+
pkginstall: pkg install -y p5-ExtUtils-MakeMaker p5-App-cpanminus openssl31
229252
- name: freebsd
230253
pretty_name: FreeBSD (LibreSSL)
231-
version: '13.0'
254+
version: '13.2'
232255
pkginstall: pkg install -y p5-ExtUtils-MakeMaker p5-App-cpanminus libressl libressl-devel
233256
- name: openbsd
234257
pretty_name: OpenBSD
235-
version: '6.9'
258+
version: '7.3'
236259
pkginstall: pkg_add curl
237260
- name: openbsd
238261
pretty_name: OpenBSD
239-
version: '7.1'
262+
version: '7.2'
240263
pkginstall: pkg_add curl
264+
- name: netbsd
265+
pretty_name: NetBSD
266+
version: '9.3'
267+
pkginstall: /usr/sbin/pkg_add http://cdn.netbsd.org/pub/pkgsrc/packages/NetBSD/amd64/9.3/All/p5-App-cpanminus
241268

242269
steps:
243270
- uses: actions/checkout@main

Changes

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,10 @@ Revision history for Perl extension Net::SSLeay.
2626
- X509_policy_tree_get0_user_policies
2727
- X509_policy_tree_level_count
2828
Patch by GitHub user orbea.
29+
- Add OpenSSL 3.1 and LibreSSL 3.7 minor releases to GitHub CI testing.
30+
Update the previous minor releases to their latest versions. Add
31+
NetBSD to BSDs job and update the other BSDs and Alpine Linux jobs to
32+
cover additional and latest releases. Use the latest MacOS runners.
2933

3034
1.93_02 2023-02-22
3135
- Update ppport.h to version 3.68. This eliminates thousands of

lib/Net/SSLeay.pod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,12 +49,12 @@ Net::SSLeay supports the following libssl implementations:
4949

5050
=item *
5151

52-
Any stable release of L<OpenSSL|https://www.openssl.org> in the 0.9.8 - 3.0
52+
Any stable release of L<OpenSSL|https://www.openssl.org> in the 0.9.8 - 3.1
5353
branches, except for OpenSSL 0.9.8 - 0.9.8b.
5454

5555
=item *
5656

57-
Any stable release of L<LibreSSL|https://www.libressl.org> in the 2.0 - 3.6
57+
Any stable release of L<LibreSSL|https://www.libressl.org> in the 2.0 - 3.7
5858
series, except for LibreSSL 3.2.2 and 3.2.3.
5959

6060
=back

0 commit comments

Comments
 (0)