Skip to content

Commit 09fb828

Browse files
committed
Startup script is now parameter in matrix
1 parent a4e5f2e commit 09fb828

File tree

1 file changed

+11
-6
lines changed

1 file changed

+11
-6
lines changed

.github/workflows/rebuildDependencies.yml

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,41 +15,46 @@ jobs:
1515
include:
1616
- platform: mac-intel
1717
os: macos-13
18+
before_install: macos.sh
1819
preset: macos-conan-ninja-release
1920
conan_profile: macos-intel
2021
conan_prebuilts: dependencies-mac-intel
2122
conan_options: --options with_apple_system_libs=True
2223
artifact_platform: intel
2324
- platform: mac-arm
2425
os: macos-13
26+
before_install: macos.sh
2527
preset: macos-arm-conan-ninja-release
2628
conan_profile: macos-arm
2729
conan_prebuilts: dependencies-mac-arm
2830
conan_options: --options with_apple_system_libs=True
2931
artifact_platform: arm
3032
- platform: ios
3133
os: macos-13
34+
before_install: macos.sh
3235
preset: ios-release-conan-ccache
3336
conan_profile: ios-arm64
3437
conan_prebuilts: dependencies-ios
3538
conan_options: --options with_apple_system_libs=True
36-
- platform: mingw
39+
- platform: mingw-x86-64
3740
os: ubuntu-24.04
41+
before_install: mingw_x86_64.sh
3842
preset: windows-mingw-conan-linux
3943
conan_profile: mingw64-linux.jinja
4044
conan_prebuilts: dependencies-mingw
41-
- platform: mingw-32
45+
- platform: mingw-x86
4246
os: ubuntu-24.04
47+
before_install: mingw_x86.sh
4348
preset: windows-mingw-conan-linux
4449
conan_profile: mingw32-linux.jinja
4550
conan_prebuilts: dependencies-mingw-32
46-
- platform: android-32
51+
- platform: android-armeabi-v7a
4752
os: ubuntu-24.04
4853
preset: android-conan-ninja-release
4954
conan_profile: android-32-ndk
5055
conan_prebuilts: dependencies-android-32
5156
artifact_platform: armeabi-v7a
52-
- platform: android-64
57+
- platform: android-arm64-v8a
5358
os: ubuntu-24.04
5459
preset: android-conan-ninja-release
5560
conan_profile: android-64-ndk
@@ -74,8 +79,8 @@ jobs:
7479
java-version: '11'
7580

7681
- name: Prepare CI
77-
if: ${{ !startsWith(matrix.platform, 'android') }}
78-
run: source '${{github.workspace}}/CI/${{matrix.platform}}/before_install.sh'
82+
if: "${{ matrix.before_install != '' }}"
83+
run: source '${{github.workspace}}/CI/before_install/${{matrix.before_install}}'
7984

8085
- name: Install Conan Dependencies
8186
if: "${{ matrix.conan_prebuilts != '' }}"

0 commit comments

Comments
 (0)