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:
44
44
conan_profile : mingw32-linux.jinja
45
45
conan_prebuilts : dependencies-mingw-32
46
46
- platform : android-32
47
- os : macos-14
47
+ os : ubuntu-24.04
48
48
preset : android-conan-ninja-release
49
49
conan_profile : android-32-ndk
50
50
conan_prebuilts : dependencies-android-32
51
- conan_options : --conf tools.android:ndk_path=$ANDROID_NDK_ROOT
52
51
artifact_platform : armeabi-v7a
53
52
- platform : android-64
54
- os : macos-14
53
+ os : ubuntu-24.04
55
54
preset : android-conan-ninja-release
56
55
conan_profile : android-64-ndk
57
56
conan_prebuilts : dependencies-android-64
58
- conan_options : --conf tools.android:ndk_path=$ANDROID_NDK_ROOT
59
57
artifact_platform : arm64-v8a
60
58
runs-on : ${{ matrix.os }}
61
59
defaults :
76
74
java-version : ' 11'
77
75
78
76
- name : Prepare CI
79
- if : ${{ !startsWith(matrix.platform, 'android-linux ') }}
77
+ if : ${{ !startsWith(matrix.platform, 'android') }}
80
78
run : source '${{github.workspace}}/CI/${{matrix.platform}}/before_install.sh'
81
79
82
80
- name : Install Conan Dependencies
You can’t perform that action at this time.
0 commit comments