Skip to content

Commit 4335501

Browse files
move system libs from profiles to separate files
CI declares a JSON array of Conan profiles now
1 parent e638a6b commit 4335501

File tree

5 files changed

+26
-24
lines changed

5 files changed

+26
-24
lines changed

.github/workflows/rebuildDependencies.yml

Lines changed: 19 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -15,42 +15,42 @@ jobs:
1515
- platform: mac-intel
1616
os: macos-14
1717
before_install: macos.sh
18-
conan_profile: macos-intel
18+
conan_profiles: '["macos-intel", "base/apple-system"]'
1919
conan_system_libs: bzip2 libiconv sqlite3 zlib
2020
- platform: mac-arm
2121
os: macos-14
2222
before_install: macos.sh
23-
conan_profile: macos-arm
23+
conan_profiles: '["macos-arm", "base/apple-system"]'
2424
conan_system_libs: bzip2 libiconv sqlite3 zlib
2525
- platform: ios
2626
os: macos-14
2727
before_install: macos.sh
28-
conan_profile: ios-arm64
28+
conan_profiles: '["ios-arm64", "base/apple-system"]'
2929
conan_system_libs: bzip2 libiconv sqlite3 zlib
3030
- platform: android-armeabi-v7a
3131
os: ubuntu-latest
3232
before_install: android-32.sh
33-
conan_profile: android-32-ndk
33+
conan_profiles: '["android-32-ndk", "base/android-system"]'
3434
conan_system_libs: zlib
3535
- platform: android-arm64-v8a
3636
os: ubuntu-latest
37-
conan_profile: android-64-ndk
37+
conan_profiles: '["android-64-ndk", "base/android-system"]'
3838
conan_system_libs: zlib
3939
- platform: android-x64
4040
os: ubuntu-latest
41-
conan_profile: android-x64-ndk
41+
conan_profiles: '["android-x64-ndk", "base/android-system"]'
4242
conan_system_libs: zlib
4343
- platform: windows-x64
4444
os: windows-latest
45-
conan_profile: msvc-x64
45+
conan_profiles: '["msvc-x64"]'
4646
conan_options: -o "&:target_pre_windows10=True"
4747
- platform: windows-x86
4848
os: windows-latest
49-
conan_profile: msvc-x86
49+
conan_profiles: '["msvc-x86"]'
5050
conan_options: -o "&:target_pre_windows10=True"
5151
- platform: windows-arm64
5252
os: windows-11-arm
53-
conan_profile: msvc-arm64
53+
conan_profiles: '["msvc-arm64"]'
5454
conan_options: -o "&:lua_lib=lua"
5555
runs-on: ${{ matrix.os }}
5656
defaults:
@@ -62,10 +62,14 @@ jobs:
6262

6363
- name: Define common variables
6464
run: |
65-
echo CUSTOM_PATCHES_PATH="$(pwd)/conan_patches" >> "$GITHUB_ENV"
65+
echo CUSTOM_PATCHES_PATH="$PWD/conan_patches" >> "$GITHUB_ENV"
6666
echo DEPS_FILE="dependencies-${{ matrix.platform }}.tgz" >> "$GITHUB_ENV"
6767
echo DEPS_LIST_FILE="dependencies-${{ matrix.platform }}.txt" >> "$GITHUB_ENV"
6868
69+
# builds a list of profile parameters, poor man's `map` function
70+
profiles="${{ join(fromJSON(matrix.conan_profiles), ' --profile=$PWD/conan_profiles/') }}"
71+
echo CONAN_PROFILES="--profile=$PWD/conan_profiles/$profiles" >> "$GITHUB_ENV"
72+
6973
- name: Prepare CI
7074
if: ${{ matrix.before_install }}
7175
run: ci/${{ matrix.before_install }}
@@ -148,9 +152,9 @@ jobs:
148152
fi
149153
150154
# Windows workaround for https://bugreports.qt.io/browse/QTBUG-84543
151-
PATH="$WINDOWS_PERL_DIR:$PATH" conan create $packagePath \
155+
PATH="$WINDOWS_PERL_DIR:$PATH" conan create "$packagePath" \
152156
--version=$version \
153-
--profile=../conan_profiles/${{ matrix.conan_profile }} \
157+
$CONAN_PROFILES \
154158
--build=missing \
155159
--test-folder= \
156160
--core-conf core.sources.patch:extra_path=$CUSTOM_PATCHES_PATH \
@@ -185,7 +189,7 @@ jobs:
185189
186190
conan create "recipes/$package/all" \
187191
--version=$version \
188-
--profile=../conan_profiles/${{ matrix.conan_profile }} \
192+
$CONAN_PROFILES \
189193
--build=missing \
190194
--test-folder=
191195
done
@@ -195,7 +199,7 @@ jobs:
195199
conan install . \
196200
--output-folder=conan-generated \
197201
--build=missing \
198-
--profile=conan_profiles/${{ matrix.conan_profile }} \
202+
$CONAN_PROFILES \
199203
${{ matrix.conan_options }}
200204
201205
- name: Remove builds and source code
@@ -219,7 +223,7 @@ jobs:
219223
packageListFile='pkglist.json'
220224
221225
conan graph info . \
222-
--profile=conan_profiles/${{ matrix.conan_profile }} \
226+
$CONAN_PROFILES \
223227
${{ matrix.conan_options }} \
224228
--format=json \
225229
--build=never \

conan_profiles/base/android

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,6 @@ compiler.libcxx=c++_shared
99
compiler.version=14
1010
os=Android
1111

12-
[replace_requires]
13-
zlib/*: zlib/[*]@system
14-
1512
[conf]
1613
# https://github.com/conan-io/conan-center-index/issues/25342
1714
# https://github.com/conan-io/conan/issues/16468#issuecomment-2175877245

conan_profiles/base/android-system

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
[replace_requires]
2+
zlib/*: zlib/[*]@system

conan_profiles/base/apple

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,6 @@ compiler.cppstd={{ vars.cppstd }}
88
compiler.libcxx=libc++
99
compiler.version=16
1010

11-
[replace_requires]
12-
bzip2/*: bzip2/[*]@system
13-
libiconv/*: libiconv/[*]@system
14-
sqlite3/*: sqlite3/[*]@system
15-
zlib/*: zlib/[*]@system
16-
1711
[conf]
1812
tools.apple:enable_bitcode=False
1913

conan_profiles/base/apple-system

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
[replace_requires]
2+
bzip2/*: bzip2/[*]@system
3+
libiconv/*: libiconv/[*]@system
4+
sqlite3/*: sqlite3/[*]@system
5+
zlib/*: zlib/[*]@system

0 commit comments

Comments
 (0)