Skip to content

Commit 0ffa7b5

Browse files
flichtenheldcron2
authored andcommitted
GHA: Dependency and Actions update April 2025
- Fix Android build with newer vcpkg Need to sync CMAKE_SYSTEM_VERSION with vcpkg. - Update mbedTLS v3 builds to latest release. Depends on commit 4897c52 - Update all actions to latest releases. Change-Id: Ie9bffcc487f53a3a8ae6e59b79e654360d99902c Signed-off-by: Frank Lichtenheld <[email protected]> Acked-by: Arne Schwabe <[email protected]> Message-Id: <[email protected]> URL: https://www.mail-archive.com/[email protected]/msg31290.html Signed-off-by: Gert Doering <[email protected]>
1 parent da65c4f commit 0ffa7b5

File tree

3 files changed

+20
-15
lines changed

3 files changed

+20
-15
lines changed

.github/workflows/build.yaml

Lines changed: 16 additions & 11 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@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
30+
- uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
3131
with:
3232
name: uncrustify-changes.patch
3333
path: 'openvpn/uncrustify-changes.patch'
@@ -58,11 +58,16 @@ jobs:
5858
- name: Install vcpkg
5959
uses: lukka/run-vcpkg@5e0cab206a5ea620130caf672fce3e4a6b5666a1 # v11.5
6060
with:
61-
vcpkgGitCommitId: 33e9c99208736b713cabe4490e15235f62f893d4
61+
vcpkgGitCommitId: acd5bba5aac8b6573b5f6f463dc0341ac0ee6fa4
6262
- name: Install dependencies
6363
run: ${VCPKG_ROOT}/vcpkg install openssl lz4 cmocka
6464
- name: configure OpenVPN with cmake
65-
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
65+
run: |
66+
cmake -S . -B openvpn-build -DUNSUPPORTED_BUILDS=yes \
67+
-DCMAKE_SYSTEM_NAME=Android -DCMAKE_SYSTEM_VERSION=28 \
68+
-DCMAKE_ANDROID_ARCH_ABI=${{ matrix.abi }} \
69+
-DOPENSSL_ROOT_DIR=${VCPKG_INSTALLED_DIR}/${{ matrix.vcpkg_triplet }} \
70+
-DENABLE_PKCS11=false -DBUILD_TESTING=true -DENABLE_LZO=false -DUSE_WERROR=no
6671
- name: Build OpenVPN Android binary with cmake
6772
run: cmake --build openvpn-build
6873

@@ -87,7 +92,7 @@ jobs:
8792
- name: Restore from cache and install vcpkg
8893
uses: lukka/run-vcpkg@5e0cab206a5ea620130caf672fce3e4a6b5666a1 # v11.5
8994
with:
90-
vcpkgGitCommitId: 33e9c99208736b713cabe4490e15235f62f893d4
95+
vcpkgGitCommitId: acd5bba5aac8b6573b5f6f463dc0341ac0ee6fa4
9196
vcpkgJsonGlob: '**/mingw/vcpkg.json'
9297

9398
- name: Run CMake with vcpkg.json manifest
@@ -97,15 +102,15 @@ jobs:
97102
buildPreset: mingw-${{ matrix.arch }}
98103
buildPresetAdditionalArgs: "['--config Debug']"
99104

100-
- uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
105+
- uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
101106
with:
102107
name: openvpn-mingw-${{ matrix.arch }}
103108
path: |
104109
${{ github.workspace }}/out/build/mingw/${{ matrix.arch }}/Debug/*.exe
105110
${{ github.workspace }}/out/build/mingw/${{ matrix.arch }}/Debug/*.dll
106111
!${{ github.workspace }}/out/build/mingw/${{ matrix.arch }}/Debug/test_*.exe
107112
108-
- uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
113+
- uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
109114
with:
110115
name: openvpn-mingw-${{ matrix.arch }}-tests
111116
path: |
@@ -126,7 +131,7 @@ jobs:
126131
- name: Checkout OpenVPN
127132
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
128133
- name: Retrieve mingw unittest
129-
uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
134+
uses: actions/download-artifact@95815c38cf2ff2164869cbab79da8d1f422bc89e # v4.2.1
130135
with:
131136
name: openvpn-mingw-${{ matrix.arch }}-tests
132137
path: unittests
@@ -271,15 +276,15 @@ jobs:
271276
runs-on: windows-latest
272277
steps:
273278
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
274-
- uses: lukka/get-cmake@5f6e04f5267c8133f1273bf2103583fc72c46b17 # v3.31.5
279+
- uses: lukka/get-cmake@56d043d188c3612951d8755da8f4b709ec951ad6 # v3.31.6
275280

276281
- name: Install rst2html
277282
run: python -m pip install --upgrade pip docutils
278283

279284
- name: Restore artifacts, or setup vcpkg (do not install any package)
280285
uses: lukka/run-vcpkg@5e0cab206a5ea620130caf672fce3e4a6b5666a1 # v11.5
281286
with:
282-
vcpkgGitCommitId: 33e9c99208736b713cabe4490e15235f62f893d4
287+
vcpkgGitCommitId: acd5bba5aac8b6573b5f6f463dc0341ac0ee6fa4
283288
vcpkgJsonGlob: '**/windows/vcpkg.json'
284289

285290
- name: Run CMake with vcpkg.json manifest (NO TESTS)
@@ -298,7 +303,7 @@ jobs:
298303
testPreset: win-${{ matrix.arch }}-release
299304
testPresetAdditionalArgs: "['--output-on-failure']"
300305

301-
- uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
306+
- uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
302307
with:
303308
name: openvpn-msvc-${{ matrix.arch }}
304309
path: |
@@ -408,7 +413,7 @@ jobs:
408413
submodules: true
409414
# versioning=semver-coerced
410415
repository: Mbed-TLS/mbedtls
411-
ref: v3.6.2
416+
ref: v3.6.3
412417
- name: "mbedtls: make no_test"
413418
run: make -j3 no_test SHARED=1
414419
working-directory: mbedtls

.github/workflows/coverity-scan.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
steps:
1414
- name: Check submission cache
1515
id: check_submit
16-
uses: actions/cache/restore@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
16+
uses: actions/cache/restore@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
1717
with:
1818
path: |
1919
cov-int
@@ -65,7 +65,7 @@ jobs:
6565

6666
- name: Cache submission
6767
if: steps.check_submit.outputs.cache-hit != 'true'
68-
uses: actions/cache/save@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
68+
uses: actions/cache/save@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
6969
with:
7070
path: |
7171
cov-int

.github/workflows/doxygen.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
touch doc/doxygen/html/.nojekyll
3535
- name: Upload static files as artifact
3636
id: deployment
37-
uses: actions/[email protected]
37+
uses: actions/upload-pages-artifact@56afc609e74202658d3ffba0e8f6dda462b719fa # v3.0.1
3838
with:
3939
path: doxygen/doc/doxygen/html/
4040

@@ -50,4 +50,4 @@ jobs:
5050
steps:
5151
- name: Deploy to GitHub Pages
5252
id: deployment
53-
uses: actions/[email protected]
53+
uses: actions/deploy-pages@d6db90164ac5ed86f2b6aed7e0febac5b3c0c03e # v4.0.5

0 commit comments

Comments
 (0)