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
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
0 commit comments