Skip to content

Commit d267f1f

Browse files
committed
Fix CI build
1 parent 9d080e9 commit d267f1f

File tree

3 files changed

+27
-15
lines changed

3 files changed

+27
-15
lines changed

.github/workflows/release.yml

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,13 @@ jobs:
3535
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*') }}-${{ hashFiles('**/gradle/wrapper/gradle-wrapper.properties') }}
3636
restore-keys: ${{ runner.os }}-gradle-
3737
- name: Android environment
38-
if: matrix.os != 'windows-latest'
38+
if: matrix.os == 'ubuntu-latest'
3939
shell: bash
4040
run: |
4141
echo "ANDROID_HOME=$ANDROID_HOME" >> $GITHUB_ENV
42-
echo "ANDROID_NDK_VERSION=25.2.9519653" >> $GITHUB_ENV
42+
echo "ANDROID_NDK_VERSION=27.2.12479018" >> $GITHUB_ENV
4343
- name: Cached Android NDK
44-
if: matrix.os != 'windows-latest'
44+
if: matrix.os == 'ubuntu-latest'
4545
uses: actions/cache@v4
4646
with:
4747
path: ${{ format('{0}/ndk/{1}', env.ANDROID_HOME, env.ANDROID_NDK_VERSION) }}
@@ -65,15 +65,19 @@ jobs:
6565
autotools
6666
mingw-w64-x86_64-gcc
6767
- name: Setup Android
68-
if: matrix.os != 'windows-latest'
68+
if: matrix.os == 'ubuntu-latest'
6969
shell: bash
7070
run: |
7171
${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager "ndk;$ANDROID_NDK_VERSION"
72-
- name: Setup Android
72+
- name: Skip Android (windows)
7373
if: matrix.os == 'windows-latest'
7474
shell: msys2 {0}
7575
run: |
7676
echo "skip.android=true" > local.properties
77+
- name: Skip Android (macos)
78+
if: matrix.os == 'macOS-latest'
79+
run: |
80+
echo "skip.android=true" > local.properties
7781
- name: Set up JDK 11
7882
uses: actions/setup-java@v4
7983
with:

.github/workflows/snapshot.yml

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,13 +44,13 @@ jobs:
4444
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*') }}-${{ hashFiles('**/gradle/wrapper/gradle-wrapper.properties') }}
4545
restore-keys: ${{ runner.os }}-gradle-
4646
- name: Android environment
47-
if: matrix.os != 'windows-latest'
47+
if: matrix.os == 'ubuntu-latest'
4848
shell: bash
4949
run: |
5050
echo "ANDROID_HOME=$ANDROID_HOME" >> $GITHUB_ENV
51-
echo "ANDROID_NDK_VERSION=25.2.9519653" >> $GITHUB_ENV
51+
echo "ANDROID_NDK_VERSION=27.2.12479018" >> $GITHUB_ENV
5252
- name: Cached Android NDK
53-
if: matrix.os != 'windows-latest'
53+
if: matrix.os == 'ubuntu-latest'
5454
uses: actions/cache@v4
5555
with:
5656
path: ${{ format('{0}/ndk/{1}', env.ANDROID_HOME, env.ANDROID_NDK_VERSION) }}
@@ -74,15 +74,19 @@ jobs:
7474
autotools
7575
mingw-w64-x86_64-gcc
7676
- name: Setup Android
77-
if: matrix.os != 'windows-latest'
77+
if: matrix.os == 'ubuntu-latest'
7878
shell: bash
7979
run: |
8080
${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager "ndk;$ANDROID_NDK_VERSION"
81-
- name: Setup Android
81+
- name: Skip Android (windows)
8282
if: matrix.os == 'windows-latest'
8383
shell: msys2 {0}
8484
run: |
8585
echo "skip.android=true" > local.properties
86+
- name: Skip Android (macos)
87+
if: matrix.os == 'macOS-latest'
88+
run: |
89+
echo "skip.android=true" > local.properties
8690
- name: Set up JDK 11
8791
uses: actions/setup-java@v4
8892
with:

.github/workflows/test.yml

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,13 +50,13 @@ jobs:
5050
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*') }}-${{ hashFiles('**/gradle/wrapper/gradle-wrapper.properties') }}
5151
restore-keys: ${{ runner.os }}-gradle-
5252
- name: Android environment
53-
if: matrix.os != 'windows-latest'
53+
if: matrix.os == 'ubuntu-latest'
5454
shell: bash
5555
run: |
5656
echo "ANDROID_HOME=$ANDROID_HOME" >> $GITHUB_ENV
57-
echo "ANDROID_NDK_VERSION=25.2.9519653" >> $GITHUB_ENV
57+
echo "ANDROID_NDK_VERSION=27.2.12479018" >> $GITHUB_ENV
5858
- name: Cached Android NDK
59-
if: matrix.os != 'windows-latest'
59+
if: matrix.os == 'ubuntu-latest'
6060
uses: actions/cache@v4
6161
with:
6262
path: ${{ format('{0}/ndk/{1}', env.ANDROID_HOME, env.ANDROID_NDK_VERSION) }}
@@ -80,15 +80,19 @@ jobs:
8080
autotools
8181
mingw-w64-x86_64-gcc
8282
- name: Setup Android
83-
if: matrix.os != 'windows-latest'
83+
if: matrix.os == 'ubuntu-latest'
8484
shell: bash
8585
run: |
8686
${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager "ndk;$ANDROID_NDK_VERSION"
87-
- name: Setup Android
87+
- name: Skip Android (windows)
8888
if: matrix.os == 'windows-latest'
8989
shell: msys2 {0}
9090
run: |
9191
echo "skip.android=true" > local.properties
92+
- name: Skip Android (macos)
93+
if: matrix.os == 'macOS-latest'
94+
run: |
95+
echo "skip.android=true" > local.properties
9296
- name: Set up JDK 11
9397
uses: actions/setup-java@v4
9498
with:

0 commit comments

Comments
 (0)