Skip to content

Commit 666e440

Browse files
flichtenheldcron2
authored andcommitted
GHA: Drop Ubuntu 20.04 and other maintenance
- Drop Ubuntu 20.04 GHA runners will go away in April 2025 - Change ubuntu-latest to ubuntu-24.04 to make sure we are not surprised by future changes. - Update vcpkg digest to latest 33e9c99 - Update github actions to latest Change-Id: I29b68675143988c3304395d9d5ec62289cf519a7 Signed-off-by: Frank Lichtenheld <frank@lichtenheld.com> Acked-by: Yuriy Darnobyt <yura.uddr@gmail.com> Message-Id: <20250212215151.619-1-gert@greenie.muc.de> URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg30852.html Signed-off-by: Gert Doering <gert@greenie.muc.de>
1 parent ced0fee commit 666e440

File tree

2 files changed

+10
-40
lines changed

2 files changed

+10
-40
lines changed

.github/workflows/build.yaml

Lines changed: 9 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
- name: Show changes on standard output
2828
run: git diff
2929
working-directory: openvpn
30-
- uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0
30+
- uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
3131
with:
3232
name: uncrustify-changes.patch
3333
path: 'openvpn/uncrustify-changes.patch'
@@ -54,7 +54,7 @@ jobs:
5454
- name: Restore from cache and install vcpkg
5555
uses: lukka/run-vcpkg@5e0cab206a5ea620130caf672fce3e4a6b5666a1 # v11.5
5656
with:
57-
vcpkgGitCommitId: 80d54ff62d528339c626a6fbc3489a7f25956ade
57+
vcpkgGitCommitId: 33e9c99208736b713cabe4490e15235f62f893d4
5858
vcpkgJsonGlob: '**/mingw/vcpkg.json'
5959

6060
- name: Run CMake with vcpkg.json manifest
@@ -64,15 +64,15 @@ jobs:
6464
buildPreset: mingw-${{ matrix.arch }}
6565
buildPresetAdditionalArgs: "['--config Debug']"
6666

67-
- uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0
67+
- uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
6868
with:
6969
name: openvpn-mingw-${{ matrix.arch }}
7070
path: |
7171
${{ github.workspace }}/out/build/mingw/${{ matrix.arch }}/Debug/*.exe
7272
${{ github.workspace }}/out/build/mingw/${{ matrix.arch }}/Debug/*.dll
7373
!${{ github.workspace }}/out/build/mingw/${{ matrix.arch }}/Debug/test_*.exe
7474
75-
- uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0
75+
- uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
7676
with:
7777
name: openvpn-mingw-${{ matrix.arch }}-tests
7878
path: |
@@ -106,16 +106,12 @@ jobs:
106106
strategy:
107107
fail-fast: false
108108
matrix:
109-
os: [ubuntu-20.04, ubuntu-22.04, ubuntu-24.04]
109+
os: [ubuntu-22.04, ubuntu-24.04]
110110
sslpkg: [libmbedtls-dev]
111111
ssllib: [mbedtls]
112112
libname: [mbed TLS]
113113

114114
include:
115-
- os: ubuntu-20.04
116-
sslpkg: "libssl-dev"
117-
libname: OpenSSL 1.1.1
118-
ssllib: openssl
119115
- os: ubuntu-22.04
120116
sslpkg: "libssl-dev"
121117
libname: OpenSSL 3.0.2
@@ -128,32 +124,6 @@ jobs:
128124
ssllib: openssl
129125
pkcs11pkg: "libpkcs11-helper1-dev softhsm2 gnutls-bin"
130126
extraconf: --enable-pkcs11
131-
- os: ubuntu-20.04
132-
sslpkg: "libssl-dev"
133-
libname: OpenSSL 1.1.1
134-
ssllib: openssl
135-
pkcs11pkg: "libpkcs11-helper1-dev softhsm2 gnutls-bin"
136-
extraconf: "--enable-iproute2 --enable-pkcs11"
137-
- os: ubuntu-20.04
138-
sslpkg: "libssl-dev"
139-
libname: OpenSSL 1.1.1
140-
ssllib: openssl
141-
extraconf: "--enable-async-push"
142-
- os: ubuntu-20.04
143-
sslpkg: "libssl-dev"
144-
libname: OpenSSL 1.1.1
145-
ssllib: openssl
146-
extraconf: "--disable-management"
147-
- os: ubuntu-20.04
148-
sslpkg: "libssl-dev"
149-
libname: OpenSSL 1.1.1
150-
ssllib: openssl
151-
extraconf: "--enable-small"
152-
- os: ubuntu-20.04
153-
sslpkg: "libssl-dev"
154-
libname: OpenSSL 1.1.1
155-
ssllib: openssl
156-
extraconf: "--disable-lzo --disable-lz4"
157127

158128
name: "gcc - ${{matrix.os}} - ${{matrix.libname}} ${{matrix.extraconf}}"
159129
env:
@@ -182,7 +152,7 @@ jobs:
182152
strategy:
183153
fail-fast: false
184154
matrix:
185-
os: [ubuntu-20.04, ubuntu-22.04, ubuntu-24.04]
155+
os: [ubuntu-22.04, ubuntu-24.04]
186156
ssllib: [mbedtls, openssl]
187157

188158
name: "clang-asan - ${{matrix.os}} - ${{matrix.ssllib}}"
@@ -268,15 +238,15 @@ jobs:
268238
runs-on: windows-latest
269239
steps:
270240
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
271-
- uses: lukka/get-cmake@8567b9d9b63052b8430ef30042e13c3ba5288f16 # v3.31.3
241+
- uses: lukka/get-cmake@5f6e04f5267c8133f1273bf2103583fc72c46b17 # v3.31.5
272242

273243
- name: Install rst2html
274244
run: python -m pip install --upgrade pip docutils
275245

276246
- name: Restore artifacts, or setup vcpkg (do not install any package)
277247
uses: lukka/run-vcpkg@5e0cab206a5ea620130caf672fce3e4a6b5666a1 # v11.5
278248
with:
279-
vcpkgGitCommitId: 80d54ff62d528339c626a6fbc3489a7f25956ade
249+
vcpkgGitCommitId: 33e9c99208736b713cabe4490e15235f62f893d4
280250
vcpkgJsonGlob: '**/windows/vcpkg.json'
281251

282252
- name: Run CMake with vcpkg.json manifest (NO TESTS)
@@ -295,7 +265,7 @@ jobs:
295265
testPreset: win-${{ matrix.arch }}-release
296266
testPresetAdditionalArgs: "['--output-on-failure']"
297267

298-
- uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0
268+
- uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
299269
with:
300270
name: openvpn-msvc-${{ matrix.arch }}
301271
path: |

.github/workflows/coverity-scan.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
# Running coverity requires the secrets.COVERITY_SCAN_TOKEN token
1010
# which is only available on the main repository
1111
if: github.repository_owner == 'OpenVPN'
12-
runs-on: ubuntu-latest
12+
runs-on: ubuntu-24.04
1313
steps:
1414
- name: Check submission cache
1515
id: check_submit

0 commit comments

Comments
 (0)