Attention is currently required from: plaisthos.
Hello plaisthos,
I'd like you to do a code review.
Please visit
http://gerrit.openvpn.net/c/openvpn/+/926?usp=email
to review the following change.
Change subject: GHA: Dependency and Actions update April 2025
......................................................................
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
4897c522948c8cdb82c0325ee08f6907cfc16f57
- Update all actions to latest releases.
Change-Id: Ie9bffcc487f53a3a8ae6e59b79e654360d99902c
Signed-off-by: Frank Lichtenheld <[email protected]>
---
M .github/workflows/build.yaml
M .github/workflows/coverity-scan.yml
M .github/workflows/doxygen.yml
3 files changed, 20 insertions(+), 15 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/26/926/1
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index b1af7ec..3fc44f5 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -27,7 +27,7 @@
- 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'
@@ -57,11 +57,16 @@
- 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
@@ -85,7 +90,7 @@
- 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
@@ -95,7 +100,7 @@
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: |
@@ -103,7 +108,7 @@
${{ 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: |
@@ -124,7 +129,7 @@
- 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
@@ -269,7 +274,7 @@
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
@@ -277,7 +282,7 @@
- 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)
@@ -296,7 +301,7 @@
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: |
@@ -406,7 +411,7 @@
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
diff --git a/.github/workflows/coverity-scan.yml
b/.github/workflows/coverity-scan.yml
index 3381d8f..222c57e 100644
--- a/.github/workflows/coverity-scan.yml
+++ b/.github/workflows/coverity-scan.yml
@@ -13,7 +13,7 @@
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 @@
- 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
diff --git a/.github/workflows/doxygen.yml b/.github/workflows/doxygen.yml
index f1ece70..ffd1b82 100644
--- a/.github/workflows/doxygen.yml
+++ b/.github/workflows/doxygen.yml
@@ -34,7 +34,7 @@
touch doc/doxygen/html/.nojekyll
- name: Upload static files as artifact
id: deployment
- uses: actions/[email protected]
+ uses:
actions/upload-pages-artifact@56afc609e74202658d3ffba0e8f6dda462b719fa # v3.0.1
with:
path: doxygen/doc/doxygen/html/
@@ -50,4 +50,4 @@
steps:
- name: Deploy to GitHub Pages
id: deployment
- uses: actions/[email protected]
+ uses: actions/deploy-pages@d6db90164ac5ed86f2b6aed7e0febac5b3c0c03e #
v4.0.5
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/926?usp=email
To unsubscribe, or for help writing mail filters, visit
http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: Ie9bffcc487f53a3a8ae6e59b79e654360d99902c
Gerrit-Change-Number: 926
Gerrit-PatchSet: 1
Gerrit-Owner: flichtenheld <[email protected]>
Gerrit-Reviewer: plaisthos <[email protected]>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]>
Gerrit-MessageType: newchange
_______________________________________________
Openvpn-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openvpn-devel
