From 6e58bfbf9a64e7cc30a82c9ea72a2e0221b45d5d Mon Sep 17 00:00:00 2001
From: sstone <fabrice@acinq.fr>
Date: Tue, 26 Nov 2024 09:39:38 +0100
Subject: [PATCH] Fix CI build

---
 .github/workflows/release.yml  | 14 +++++++++-----
 .github/workflows/snapshot.yml | 14 +++++++++-----
 .github/workflows/test.yml     | 14 +++++++++-----
 3 files changed, 27 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 78874b3..f0dc281 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -35,13 +35,13 @@ jobs:
           key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*') }}-${{ hashFiles('**/gradle/wrapper/gradle-wrapper.properties') }}
           restore-keys: ${{ runner.os }}-gradle-
       - name: Android environment
-        if: matrix.os != 'windows-latest'
+        if: matrix.os == 'ubuntu-latest'
         shell: bash
         run: |
           echo "ANDROID_HOME=$ANDROID_HOME" >> $GITHUB_ENV
-          echo "ANDROID_NDK_VERSION=25.2.9519653" >> $GITHUB_ENV
+          echo "ANDROID_NDK_VERSION=27.2.12479018" >> $GITHUB_ENV
       - name: Cached Android NDK
-        if: matrix.os != 'windows-latest'
+        if: matrix.os == 'ubuntu-latest'
         uses: actions/cache@v4
         with:
           path: ${{ format('{0}/ndk/{1}', env.ANDROID_HOME, env.ANDROID_NDK_VERSION) }}
@@ -65,15 +65,19 @@ jobs:
             autotools
             mingw-w64-x86_64-gcc
       - name: Setup Android
-        if: matrix.os != 'windows-latest'
+        if: matrix.os == 'ubuntu-latest'
         shell: bash
         run: |
           ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager "ndk;$ANDROID_NDK_VERSION"
-      - name: Setup Android
+      - name: Skip Android (windows)
         if: matrix.os == 'windows-latest'
         shell: msys2 {0}
         run: |
           echo "skip.android=true" > local.properties
+      - name: Skip Android (macos)
+        if: matrix.os == 'macOS-latest'
+        run: |
+          echo "skip.android=true" > local.properties
       - name: Set up JDK 11
         uses: actions/setup-java@v4
         with:
diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml
index 6cbaf61..9a182d7 100644
--- a/.github/workflows/snapshot.yml
+++ b/.github/workflows/snapshot.yml
@@ -44,13 +44,13 @@ jobs:
           key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*') }}-${{ hashFiles('**/gradle/wrapper/gradle-wrapper.properties') }}
           restore-keys: ${{ runner.os }}-gradle-
       - name: Android environment
-        if: matrix.os != 'windows-latest'
+        if: matrix.os == 'ubuntu-latest'
         shell: bash
         run: |
           echo "ANDROID_HOME=$ANDROID_HOME" >> $GITHUB_ENV
-          echo "ANDROID_NDK_VERSION=25.2.9519653" >> $GITHUB_ENV
+          echo "ANDROID_NDK_VERSION=27.2.12479018" >> $GITHUB_ENV
       - name: Cached Android NDK
-        if: matrix.os != 'windows-latest'
+        if: matrix.os == 'ubuntu-latest'
         uses: actions/cache@v4
         with:
           path: ${{ format('{0}/ndk/{1}', env.ANDROID_HOME, env.ANDROID_NDK_VERSION) }}
@@ -74,15 +74,19 @@ jobs:
             autotools
             mingw-w64-x86_64-gcc
       - name: Setup Android
-        if: matrix.os != 'windows-latest'
+        if: matrix.os == 'ubuntu-latest'
         shell: bash
         run: |
           ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager "ndk;$ANDROID_NDK_VERSION"
-      - name: Setup Android
+      - name: Skip Android (windows)
         if: matrix.os == 'windows-latest'
         shell: msys2 {0}
         run: |
           echo "skip.android=true" > local.properties
+      - name: Skip Android (macos)
+        if: matrix.os == 'iOS-latest'
+        run: |
+          echo "skip.android=true" > local.properties
       - name: Set up JDK 11
         uses: actions/setup-java@v4
         with:
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index ff6c438..cd71358 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -50,13 +50,13 @@ jobs:
           key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*') }}-${{ hashFiles('**/gradle/wrapper/gradle-wrapper.properties') }}
           restore-keys: ${{ runner.os }}-gradle-
       - name: Android environment
-        if: matrix.os != 'windows-latest'
+        if: matrix.os == 'ubuntu-latest'
         shell: bash
         run: |
           echo "ANDROID_HOME=$ANDROID_HOME" >> $GITHUB_ENV
-          echo "ANDROID_NDK_VERSION=25.2.9519653" >> $GITHUB_ENV
+          echo "ANDROID_NDK_VERSION=27.2.12479018" >> $GITHUB_ENV
       - name: Cached Android NDK
-        if: matrix.os != 'windows-latest'
+        if: matrix.os == 'ubuntu-latest'
         uses: actions/cache@v4
         with:
           path: ${{ format('{0}/ndk/{1}', env.ANDROID_HOME, env.ANDROID_NDK_VERSION) }}
@@ -80,15 +80,19 @@ jobs:
             autotools
             mingw-w64-x86_64-gcc
       - name: Setup Android
-        if: matrix.os != 'windows-latest'
+        if: matrix.os == 'ubuntu-latest'
         shell: bash
         run: |
           ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager "ndk;$ANDROID_NDK_VERSION"
-      - name: Setup Android
+      - name: Skip Android (windows)
         if: matrix.os == 'windows-latest'
         shell: msys2 {0}
         run: |
           echo "skip.android=true" > local.properties
+      - name: Skip Android (macos)
+        if: matrix.os == 'macOS-latest'
+        run: |
+          echo "skip.android=true" > local.properties
       - name: Set up JDK 11
         uses: actions/setup-java@v4
         with: