[Openvpn-devel,v2] GHA: Use latest NDK

Message ID 20261116145616.8110-1-gert@greenie.muc.de
State New
Headers
Series [Openvpn-devel,v2] GHA: Use latest NDK |

Commit Message

Gert Doering Nov. 16, 2026, 2:56 p.m. UTC
  From: Frank Lichtenheld <frank@lichtenheld.com>

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 <frank@lichtenheld.com>
Acked-by: Razvan Cojocaru <razvanc@mailbox.org>
Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/2194
---

This change was reviewed on Gerrit and approved by at least one
developer. I request to merge it to master.

Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/2194
This mail reflects revision 2 of this Change.

Acked-by according to Gerrit (reflected above):
Razvan Cojocaru <razvanc@mailbox.org>
  

Comments

Gert Doering Nov. 16, 2026, 3:02 p.m. UTC | #1
Thanks for bumping these versions.  Confirmed (on v1) that this fixes
the Android build fails (integer warnings -> errors) in GHA.

Your patch has been applied to the master branch.

commit 296e167250b2320b73e405d605da0f523e17383c
Author: Frank Lichtenheld
Date:   Mon Nov 16 15:56:10 2026 +0100

     GHA: Use latest NDK

     Signed-off-by: Frank Lichtenheld <frank@lichtenheld.com>
     Acked-by: Razvan Cojocaru <razvanc@mailbox.org>
     Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/2194
     Message-Id: <20261116145616.8110-1-gert@greenie.muc.de>
     URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg41457.html
     Signed-off-by: Gert Doering <gert@greenie.muc.de>


--
kind regards,

Gert Doering
  

Patch

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index d50b7ff..19c78e9 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
@@ -290,7 +292,7 @@ 
       env:
         BUILD_CONFIGURATION: Release
         VCPKG_BINARY_SOURCES: clear;default,readwrite
-        VCPKG_GIT_COMMIT_ID: 5f96cd15fd745122cf27e0524606d6c1efc5fd07
+        VCPKG_GIT_COMMIT_ID: 8f363bdc11359ede4bc51e5eb32a2617538049c8
 
       runs-on: windows-2025-vs2026
       steps: