Skip to content

Commit a4e5f2e

Browse files
committed
Try to use linux runner for Android build
1 parent 9d72d4b commit a4e5f2e

File tree

1 file changed

+3
-5
lines changed

1 file changed

+3
-5
lines changed

.github/workflows/rebuildDependencies.yml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,18 +44,16 @@ jobs:
4444
conan_profile: mingw32-linux.jinja
4545
conan_prebuilts: dependencies-mingw-32
4646
- platform: android-32
47-
os: macos-14
47+
os: ubuntu-24.04
4848
preset: android-conan-ninja-release
4949
conan_profile: android-32-ndk
5050
conan_prebuilts: dependencies-android-32
51-
conan_options: --conf tools.android:ndk_path=$ANDROID_NDK_ROOT
5251
artifact_platform: armeabi-v7a
5352
- platform: android-64
54-
os: macos-14
53+
os: ubuntu-24.04
5554
preset: android-conan-ninja-release
5655
conan_profile: android-64-ndk
5756
conan_prebuilts: dependencies-android-64
58-
conan_options: --conf tools.android:ndk_path=$ANDROID_NDK_ROOT
5957
artifact_platform: arm64-v8a
6058
runs-on: ${{ matrix.os }}
6159
defaults:
@@ -76,7 +74,7 @@ jobs:
7674
java-version: '11'
7775

7876
- name: Prepare CI
79-
if: ${{ !startsWith(matrix.platform, 'android-linux') }}
77+
if: ${{ !startsWith(matrix.platform, 'android') }}
8078
run: source '${{github.workspace}}/CI/${{matrix.platform}}/before_install.sh'
8179

8280
- name: Install Conan Dependencies

0 commit comments

Comments
 (0)