upstream/openvpn
1
0
Fork 0
mirror of https://github.com/OpenVPN/openvpn.git synced 2026-05-28 04:03:29 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

GHA: Dependency and Actions update April 2025

Browse source 
- Fix Android build with newer vcpkg
  Need to sync CMAKE_SYSTEM_VERSION with vcpkg.
- Update mbedTLS v3 builds to latest release.
  Depends on commit
  4897c52294
- Update all actions to latest releases.

Change-Id: Ie9bffcc487f53a3a8ae6e59b79e654360d99902c
Signed-off-by: Frank Lichtenheld <frank@lichtenheld.com>
Acked-by: Arne Schwabe <arne-openvpn@rfc2549.org>
Message-Id: <20250331153309.77901-1-frank@lichtenheld.com>
URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg31290.html
Signed-off-by: Gert Doering <gert@greenie.muc.de>
This commit is contained in:
Frank Lichtenheld 2025-03-31 17:33:09 +02:00 committed by Gert Doering
parent da65c4fdde
commit 0ffa7b57fd
3 changed files with 20 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
.github/workflows/build.yaml vendored
View file

@ -27,7 +27,7 @@ jobs:
- name: Show changes on standard output
run: git diff
working-directory: openvpn
- uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
- uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
with:
name: uncrustify-changes.patch
path: 'openvpn/uncrustify-changes.patch'
@ -58,11 +58,16 @@ jobs:
- name: Install vcpkg
uses: lukka/run-vcpkg@5e0cab206a5ea620130caf672fce3e4a6b5666a1 # v11.5
with:
vcpkgGitCommitId: 33e9c99208736b713cabe4490e15235f62f893d4
vcpkgGitCommitId: acd5bba5aac8b6573b5f6f463dc0341ac0ee6fa4
- name: Install dependencies
run: ${VCPKG_ROOT}/vcpkg install openssl lz4 cmocka
- name: configure OpenVPN with cmake
run: cmake -S . -B openvpn-build -DUNSUPPORTED_BUILDS=yes -DCMAKE_SYSTEM_NAME=Android -DOPENSSL_ROOT_DIR=${VCPKG_INSTALLED_DIR}/${{ matrix.vcpkg_triplet }} -DENABLE_PKCS11=false -DBUILD_TESTING=true -DCMAKE_ANDROID_ARCH_ABI=${{ matrix.abi }} -DENABLE_LZO=false -DUSE_WERROR=no
run: |
cmake -S . -B openvpn-build -DUNSUPPORTED_BUILDS=yes \
-DCMAKE_SYSTEM_NAME=Android -DCMAKE_SYSTEM_VERSION=28 \
-DCMAKE_ANDROID_ARCH_ABI=${{ matrix.abi }} \
-DOPENSSL_ROOT_DIR=${VCPKG_INSTALLED_DIR}/${{ matrix.vcpkg_triplet }} \
-DENABLE_PKCS11=false -DBUILD_TESTING=true -DENABLE_LZO=false -DUSE_WERROR=no
- name: Build OpenVPN Android binary with cmake
run: cmake --build openvpn-build
@ -87,7 +92,7 @@ jobs:
- name: Restore from cache and install vcpkg
uses: lukka/run-vcpkg@5e0cab206a5ea620130caf672fce3e4a6b5666a1 # v11.5
with:
vcpkgGitCommitId: 33e9c99208736b713cabe4490e15235f62f893d4
vcpkgGitCommitId: acd5bba5aac8b6573b5f6f463dc0341ac0ee6fa4
vcpkgJsonGlob: '**/mingw/vcpkg.json'
- name: Run CMake with vcpkg.json manifest
@ -97,7 +102,7 @@ jobs:
buildPreset: mingw-${{ matrix.arch }}
buildPresetAdditionalArgs: "['--config Debug']"
- uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
- uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
with:
name: openvpn-mingw-${{ matrix.arch }}
path: |
@ -105,7 +110,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@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
- uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
with:
name: openvpn-mingw-${{ matrix.arch }}-tests
path: |
@ -126,7 +131,7 @@ jobs:
- name: Checkout OpenVPN
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
- name: Retrieve mingw unittest
uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
uses: actions/download-artifact@95815c38cf2ff2164869cbab79da8d1f422bc89e # v4.2.1
with:
name: openvpn-mingw-${{ matrix.arch }}-tests
path: unittests
@ -271,7 +276,7 @@ jobs:
runs-on: windows-latest
steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
- uses: lukka/get-cmake@5f6e04f5267c8133f1273bf2103583fc72c46b17 # v3.31.5
- uses: lukka/get-cmake@56d043d188c3612951d8755da8f4b709ec951ad6 # v3.31.6
- name: Install rst2html
run: python -m pip install --upgrade pip docutils
@ -279,7 +284,7 @@ jobs:
- name: Restore artifacts, or setup vcpkg (do not install any package)
uses: lukka/run-vcpkg@5e0cab206a5ea620130caf672fce3e4a6b5666a1 # v11.5
with:
vcpkgGitCommitId: 33e9c99208736b713cabe4490e15235f62f893d4
vcpkgGitCommitId: acd5bba5aac8b6573b5f6f463dc0341ac0ee6fa4
vcpkgJsonGlob: '**/windows/vcpkg.json'
- name: Run CMake with vcpkg.json manifest (NO TESTS)
@ -298,7 +303,7 @@ jobs:
testPreset: win-${{ matrix.arch }}-release
testPresetAdditionalArgs: "['--output-on-failure']"
- uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
- uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
with:
name: openvpn-msvc-${{ matrix.arch }}
path: |
@ -408,7 +413,7 @@ jobs:
submodules: true
# versioning=semver-coerced
repository: Mbed-TLS/mbedtls
ref: v3.6.2
ref: v3.6.3
- name: "mbedtls: make no_test"
run: make -j3 no_test SHARED=1
working-directory: mbedtls

4
.github/workflows/coverity-scan.yml vendored
View file

@ -13,7 +13,7 @@ jobs:
steps:
- name: Check submission cache
id: check_submit
uses: actions/cache/restore@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
uses: actions/cache/restore@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
with:
path: |
cov-int
@ -65,7 +65,7 @@ jobs:
- name: Cache submission
if: steps.check_submit.outputs.cache-hit != 'true'
uses: actions/cache/save@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
uses: actions/cache/save@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
with:
path: |
cov-int

4
.github/workflows/doxygen.yml vendored
View file

@ -34,7 +34,7 @@ jobs:
touch doc/doxygen/html/.nojekyll
- name: Upload static files as artifact
id: deployment
uses: actions/upload-pages-artifact@v3.0.1
uses: actions/upload-pages-artifact@56afc609e74202658d3ffba0e8f6dda462b719fa # v3.0.1
with:
path: doxygen/doc/doxygen/html/
@ -50,4 +50,4 @@ jobs:
steps:
- name: Deploy to GitHub Pages
id: deployment
uses: actions/deploy-pages@v4.0.5
uses: actions/deploy-pages@d6db90164ac5ed86f2b6aed7e0febac5b3c0c03e # v4.0.5