Skip to content

Commit f323010

Browse files
committed
Cleaned up unused parameters, clarified steps names
1 parent 16e8011 commit f323010

File tree

1 file changed

+2
-14
lines changed

1 file changed

+2
-14
lines changed

.github/workflows/rebuildDependencies.yml

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -16,50 +16,39 @@ jobs:
1616
- platform: mac-intel
1717
os: macos-13
1818
before_install: macos.sh
19-
preset: macos-conan-ninja-release
2019
conan_profile: macos-intel
2120
conan_prebuilts: dependencies-mac-intel
2221
conan_options: --options with_apple_system_libs=True
23-
artifact_platform: intel
2422
- platform: mac-arm
2523
os: macos-13
2624
before_install: macos.sh
27-
preset: macos-arm-conan-ninja-release
2825
conan_profile: macos-arm
2926
conan_prebuilts: dependencies-mac-arm
3027
conan_options: --options with_apple_system_libs=True
31-
artifact_platform: arm
3228
- platform: ios
3329
os: macos-13
3430
before_install: macos.sh
35-
preset: ios-release-conan-ccache
3631
conan_profile: ios-arm64
3732
conan_prebuilts: dependencies-ios
3833
conan_options: --options with_apple_system_libs=True
3934
- platform: mingw-x86-64
4035
os: ubuntu-24.04
4136
before_install: mingw_x86_64.sh
42-
preset: windows-mingw-conan-linux
4337
conan_profile: mingw64-linux.jinja
4438
conan_prebuilts: dependencies-mingw
4539
- platform: mingw-x86
4640
os: ubuntu-24.04
4741
before_install: mingw_x86.sh
48-
preset: windows-mingw-conan-linux
4942
conan_profile: mingw32-linux.jinja
5043
conan_prebuilts: dependencies-mingw-32
5144
- platform: android-armeabi-v7a
5245
os: ubuntu-24.04
53-
preset: android-conan-ninja-release
5446
conan_profile: android-32-ndk
5547
conan_prebuilts: dependencies-android-32
56-
artifact_platform: armeabi-v7a
5748
- platform: android-arm64-v8a
5849
os: ubuntu-24.04
59-
preset: android-conan-ninja-release
6050
conan_profile: android-64-ndk
6151
conan_prebuilts: dependencies-android-64
62-
artifact_platform: arm64-v8a
6352
runs-on: ${{ matrix.os }}
6453
defaults:
6554
run:
@@ -86,12 +75,12 @@ jobs:
8675
if: "${{ matrix.conan_prebuilts != '' }}"
8776
run: source '${{github.workspace}}/CI/install_conan_dependencies.sh' '${{matrix.conan_prebuilts}}'
8877

89-
- name: Remove old binary packages
78+
- name: Remove old binary packages (non-android)
9079
if: ${{ !startsWith(matrix.platform, 'android') }}
9180
run: rm -rf ~/.conan/data/*/*/_/_/package
9281

9382
# TODO: fix libiconv - fails to build on android (both macos and linux host)
94-
- name: Remove old binary packages
83+
- name: Remove old binary packages (android)
9584
if: ${{ startsWith(matrix.platform, 'android') }}
9685
run: |
9786
mv ~/.conan/data/libiconv ~/
@@ -103,7 +92,6 @@ jobs:
10392
- name: Remove old recipes
10493
run: |
10594
rm -rf ~/.conan/data/ffmpeg
106-
rm -rf ~/.conan/data/pkgconfig
10795
rm -rf ~/.conan/data/xz_utils
10896
rm -rf ~/.conan/data/sdl_mixer
10997
rm -rf ~/.conan/data/sdl_image

0 commit comments

Comments
 (0)