File tree Expand file tree Collapse file tree 1 file changed +3
-5
lines changed Expand file tree Collapse file tree 1 file changed +3
-5
lines changed Original file line number Diff line number Diff 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 :
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
You can’t perform that action at this time.
0 commit comments