Attention is currently required from: Arne Schwabe.

Hello Arne Schwabe,

I'd like you to do a code review.
Please visit

    https://gerrit.openvpn.net/c/openvpn/+/2194?usp=email

to review the following change.


Change subject: GHA: Use latest NDK
......................................................................

GHA: Use latest NDK

Stay in sync with what buildbot uses. The images still use
NDK r27 which is quite old by now.

While here, update vcpkg reference to latest master.

Change-Id: Ib2849dc2c0a451b26fad985faf757ff22a852e91
Signed-off-by: Frank Lichtenheld <[email protected]>
---
M .github/workflows/build.yaml
1 file changed, 6 insertions(+), 4 deletions(-)



  git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/94/2194/1

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index d50b7ff..cbe5a1b 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -36,14 +36,12 @@
             vcpkg_triplet: arm64-android
     runs-on: ubuntu-26.04
     name: "Android - ${{ matrix.abi }}"
-    # Github images already setup NDK with ANDROID_NDK_ROOT pointing to the 
root
-    # of the SDK
     env:
       VCPKG_DEFAULT_TRIPLET: ${{ matrix.vcpkg_triplet }}
       VCPKG_ROOT: ${{ github.workspace }}/vcpkg
       VCPKG_INSTALLED_DIR: ${{ github.workspace }}/vcpkg/installed
       VCPKG_BINARY_SOURCES: clear;default,readwrite
-      VCPKG_GIT_COMMIT_ID: 5f96cd15fd745122cf27e0524606d6c1efc5fd07
+      VCPKG_GIT_COMMIT_ID: 8f363bdc11359ede4bc51e5eb32a2617538049c8
     steps:
       - name: Checkout OpenVPN
         uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # 
v7.0.1
@@ -59,6 +57,10 @@
           key: android-${{ matrix.abi }}-vcpkg-binary-cache-${{ 
env.VCPKG_GIT_COMMIT_ID }}
           restore-keys: |
             android-${{ matrix.abi }}-vcpkg-binary-cache-
+      - name: Configure NDK version
+        run: |
+          echo "ANDROID_NDK_HOME=$ANDROID_NDK_LATEST_HOME" >>$GITHUB_ENV
+          echo "ANDROID_NDK_ROOT=$ANDROID_NDK_LATEST_HOME" >>$GITHUB_ENV
       - name: Install dependencies
         run: ${VCPKG_ROOT}/vcpkg install openssl lz4 cmocka
       - name: configure OpenVPN with cmake
@@ -90,7 +92,7 @@
     env:
       VCPKG_ROOT: ${{ github.workspace }}/vcpkg
       VCPKG_BINARY_SOURCES: clear;default,readwrite
-      VCPKG_GIT_COMMIT_ID: 5f96cd15fd745122cf27e0524606d6c1efc5fd07
+      VCPKG_GIT_COMMIT_ID: 8f363bdc11359ede4bc51e5eb32a2617538049c8
     steps:
       - name: Install dependencies
         run: sudo apt update && sudo apt install -y mingw-w64 unzip 
build-essential wget python3-docutils man2html-base

--
To view, visit https://gerrit.openvpn.net/c/openvpn/+/2194?usp=email
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.openvpn.net/settings?usp=email

Gerrit-MessageType: newchange
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: Ib2849dc2c0a451b26fad985faf757ff22a852e91
Gerrit-Change-Number: 2194
Gerrit-PatchSet: 1
Gerrit-Owner: Frank Lichtenheld <[email protected]>
Gerrit-Reviewer: Arne Schwabe <[email protected]>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: Arne Schwabe <[email protected]>
_______________________________________________
Openvpn-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openvpn-devel

Reply via email to