Skip to content

Commit e8f64c6

Browse files
committed
address review comments
1 parent 9616cbe commit e8f64c6

File tree

2 files changed

+9
-8
lines changed

2 files changed

+9
-8
lines changed

.github/workflows/rebuildDependencies.yml

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -225,6 +225,7 @@ jobs:
225225

226226
- name: Remove build requirements' binaries
227227
run: |
228+
set -x
228229
graphFile='graph.json'
229230
hostPackagesFile='packages-host.json'
230231
buildPackagesFile='packages-build.json'
@@ -252,13 +253,13 @@ jobs:
252253
253254
# Some are both build and host requirements and must not be removed
254255
# => exclude them from the list
255-
cat $buildPackagesFile $hostPackagesFile | jq -s '
256-
.[0]["Local Cache"] as $build_packages
257-
| (.[1]["Local Cache"] | keys) as $host_package_names
258-
| $build_packages
259-
| with_entries(select(.key as $k | $host_package_names | index($k) == null)) as $packages
260-
| {"Local Cache": $packages}
261-
' > $buildFilteredPackagesFile
256+
python3 -c '
257+
import json, sys
258+
build_dict = json.load(open(sys.argv[1]))["Local Cache"] # => {"pkg1": {...}, "pkg2": {...}, ...}
259+
host_list = json.load(open(sys.argv[2]))["Local Cache"] # => ["pkg1", "pkg2", ...]
260+
filtered_dict = {k: v for k, v in build_dict.items() if k not in host_list}
261+
json.dump({"Local Cache": filtered_dict}, open(sys.argv[3], "w"))
262+
' "$buildPackagesFile" "$hostPackagesFile" "$buildFilteredPackagesFile"
262263
263264
conan remove --list "$buildFilteredPackagesFile" --confirm
264265

conan_profiles/base/common

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ sqlite3/*:build_executable=False
226226
opusfile/*:http=False
227227
zstd/*:build_programs=False
228228

229-
# Prevents libcurl dependency (fails to build due to system zlib)
229+
# Prevents onnxruntime->date->libcurl dependency
230230
# NOTE: use_system_tz_db is specific to date/3.0.1
231231
# Newer date recipes would need the tz_db=system option instead.
232232
date/*:use_system_tz_db=True

0 commit comments

Comments
 (0)