mirror of
https://github.com/OpenVPN/openvpn.git
synced 2026-05-28 04:03:29 -04:00
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>
This commit is contained in:
parent
817577d56b
commit
c26b2e2c55
2 changed files with 10 additions and 40 deletions
48
.github/workflows/build.yaml
vendored
48
.github/workflows/build.yaml
vendored
|
|
@ -27,7 +27,7 @@ jobs:
|
|||
- name: Show changes on standard output
|
||||
run: git diff
|
||||
working-directory: openvpn
|
||||
- uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0
|
||||
- uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
|
||||
with:
|
||||
name: uncrustify-changes.patch
|
||||
path: 'openvpn/uncrustify-changes.patch'
|
||||
|
|
@ -54,7 +54,7 @@ jobs:
|
|||
- name: Restore from cache and install vcpkg
|
||||
uses: lukka/run-vcpkg@5e0cab206a5ea620130caf672fce3e4a6b5666a1 # v11.5
|
||||
with:
|
||||
vcpkgGitCommitId: 80d54ff62d528339c626a6fbc3489a7f25956ade
|
||||
vcpkgGitCommitId: 33e9c99208736b713cabe4490e15235f62f893d4
|
||||
vcpkgJsonGlob: '**/mingw/vcpkg.json'
|
||||
|
||||
- name: Run CMake with vcpkg.json manifest
|
||||
|
|
@ -64,7 +64,7 @@ jobs:
|
|||
buildPreset: mingw-${{ matrix.arch }}
|
||||
buildPresetAdditionalArgs: "['--config Debug']"
|
||||
|
||||
- uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0
|
||||
- uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
|
||||
with:
|
||||
name: openvpn-mingw-${{ matrix.arch }}
|
||||
path: |
|
||||
|
|
@ -72,7 +72,7 @@ jobs:
|
|||
${{ github.workspace }}/out/build/mingw/${{ matrix.arch }}/Debug/*.dll
|
||||
!${{ github.workspace }}/out/build/mingw/${{ matrix.arch }}/Debug/test_*.exe
|
||||
|
||||
- uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0
|
||||
- uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
|
||||
with:
|
||||
name: openvpn-mingw-${{ matrix.arch }}-tests
|
||||
path: |
|
||||
|
|
@ -106,16 +106,12 @@ jobs:
|
|||
strategy:
|
||||
fail-fast: false
|
||||
matrix:
|
||||
os: [ubuntu-20.04, ubuntu-22.04, ubuntu-24.04]
|
||||
os: [ubuntu-22.04, ubuntu-24.04]
|
||||
sslpkg: [libmbedtls-dev]
|
||||
ssllib: [mbedtls]
|
||||
libname: [mbed TLS]
|
||||
|
||||
include:
|
||||
- os: ubuntu-20.04
|
||||
sslpkg: "libssl-dev"
|
||||
libname: OpenSSL 1.1.1
|
||||
ssllib: openssl
|
||||
- os: ubuntu-22.04
|
||||
sslpkg: "libssl-dev"
|
||||
libname: OpenSSL 3.0.2
|
||||
|
|
@ -128,32 +124,6 @@ jobs:
|
|||
ssllib: openssl
|
||||
pkcs11pkg: "libpkcs11-helper1-dev softhsm2 gnutls-bin"
|
||||
extraconf: --enable-pkcs11
|
||||
- os: ubuntu-20.04
|
||||
sslpkg: "libssl-dev"
|
||||
libname: OpenSSL 1.1.1
|
||||
ssllib: openssl
|
||||
pkcs11pkg: "libpkcs11-helper1-dev softhsm2 gnutls-bin"
|
||||
extraconf: "--enable-iproute2 --enable-pkcs11"
|
||||
- os: ubuntu-20.04
|
||||
sslpkg: "libssl-dev"
|
||||
libname: OpenSSL 1.1.1
|
||||
ssllib: openssl
|
||||
extraconf: "--enable-async-push"
|
||||
- os: ubuntu-20.04
|
||||
sslpkg: "libssl-dev"
|
||||
libname: OpenSSL 1.1.1
|
||||
ssllib: openssl
|
||||
extraconf: "--disable-management"
|
||||
- os: ubuntu-20.04
|
||||
sslpkg: "libssl-dev"
|
||||
libname: OpenSSL 1.1.1
|
||||
ssllib: openssl
|
||||
extraconf: "--enable-small"
|
||||
- os: ubuntu-20.04
|
||||
sslpkg: "libssl-dev"
|
||||
libname: OpenSSL 1.1.1
|
||||
ssllib: openssl
|
||||
extraconf: "--disable-lzo --disable-lz4"
|
||||
|
||||
name: "gcc - ${{matrix.os}} - ${{matrix.libname}} ${{matrix.extraconf}}"
|
||||
env:
|
||||
|
|
@ -182,7 +152,7 @@ jobs:
|
|||
strategy:
|
||||
fail-fast: false
|
||||
matrix:
|
||||
os: [ubuntu-20.04, ubuntu-22.04, ubuntu-24.04]
|
||||
os: [ubuntu-22.04, ubuntu-24.04]
|
||||
ssllib: [mbedtls, openssl]
|
||||
|
||||
name: "clang-asan - ${{matrix.os}} - ${{matrix.ssllib}}"
|
||||
|
|
@ -268,7 +238,7 @@ jobs:
|
|||
runs-on: windows-latest
|
||||
steps:
|
||||
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
|
||||
- uses: lukka/get-cmake@8567b9d9b63052b8430ef30042e13c3ba5288f16 # v3.31.3
|
||||
- uses: lukka/get-cmake@5f6e04f5267c8133f1273bf2103583fc72c46b17 # v3.31.5
|
||||
|
||||
- name: Install rst2html
|
||||
run: python -m pip install --upgrade pip docutils
|
||||
|
|
@ -276,7 +246,7 @@ jobs:
|
|||
- name: Restore artifacts, or setup vcpkg (do not install any package)
|
||||
uses: lukka/run-vcpkg@5e0cab206a5ea620130caf672fce3e4a6b5666a1 # v11.5
|
||||
with:
|
||||
vcpkgGitCommitId: 80d54ff62d528339c626a6fbc3489a7f25956ade
|
||||
vcpkgGitCommitId: 33e9c99208736b713cabe4490e15235f62f893d4
|
||||
vcpkgJsonGlob: '**/windows/vcpkg.json'
|
||||
|
||||
- name: Run CMake with vcpkg.json manifest (NO TESTS)
|
||||
|
|
@ -295,7 +265,7 @@ jobs:
|
|||
testPreset: win-${{ matrix.arch }}-release
|
||||
testPresetAdditionalArgs: "['--output-on-failure']"
|
||||
|
||||
- uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0
|
||||
- uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
|
||||
with:
|
||||
name: openvpn-msvc-${{ matrix.arch }}
|
||||
path: |
|
||||
|
|
|
|||
2
.github/workflows/coverity-scan.yml
vendored
2
.github/workflows/coverity-scan.yml
vendored
|
|
@ -9,7 +9,7 @@ jobs:
|
|||
# Running coverity requires the secrets.COVERITY_SCAN_TOKEN token
|
||||
# which is only available on the main repository
|
||||
if: github.repository_owner == 'OpenVPN'
|
||||
runs-on: ubuntu-latest
|
||||
runs-on: ubuntu-24.04
|
||||
steps:
|
||||
- name: Check submission cache
|
||||
id: check_submit
|
||||
|
|
|
|||
Loading…
Reference in a new issue