From 7f4f97405568756be52778f25e2ddc340fa90238 Mon Sep 17 00:00:00 2001 From: Andrey Filipenkov Date: Wed, 10 Dec 2025 11:50:06 +0300 Subject: [PATCH 1/2] revert manual collecting of build context packages - adds workaround for https://github.com/conan-io/conan/issues/19366 - partially reverts #19 --- .github/workflows/rebuildDependencies.yml | 28 ++++------------------- 1 file changed, 5 insertions(+), 23 deletions(-) diff --git a/.github/workflows/rebuildDependencies.yml b/.github/workflows/rebuildDependencies.yml index 6f1d175..1221bd3 100644 --- a/.github/workflows/rebuildDependencies.yml +++ b/.github/workflows/rebuildDependencies.yml @@ -225,41 +225,23 @@ jobs: - name: Remove build requirements' binaries run: | graphFile='graph.json' - hostPackagesFile='packages-host.json' - buildPackagesFile='packages-build.json' - buildFilteredPackagesFile='packages-build-filtered.txt' + packageListFile='pkglist.json' + # the special conf is a workaround for https://github.com/conan-io/conan/issues/19366 conan graph info . \ $CONAN_PROFILES \ ${{ matrix.conan_options }} \ --format=json \ --build=never \ --no-remote \ + --conf:all="tools.graph:skip_binaries=False" \ > "$graphFile" - conan list \ --graph "$graphFile" \ --graph-context=build-only \ --format=json \ - > $buildPackagesFile - - conan list \ - --graph "$graphFile" \ - --graph-context=host \ - --format=json \ - > $hostPackagesFile - - # Some are both build and host requirements and must not be removed - # => exclude them from the list - python3 -c ' - import json, sys - build_dict = json.load(open(sys.argv[1]))["Local Cache"] # => {"pkg1": {...}, "pkg2": {...}, ...} - host_list = json.load(open(sys.argv[2]))["Local Cache"] # => ["pkg1", "pkg2", ...] - filtered_dict = {k: v for k, v in build_dict.items() if k not in host_list} - json.dump({"Local Cache": filtered_dict}, open(sys.argv[3], "w")) - ' "$buildPackagesFile" "$hostPackagesFile" "$buildFilteredPackagesFile" - - conan remove --list "$buildFilteredPackagesFile" --confirm + > "$packageListFile" + conan remove --list "$packageListFile" --confirm - name: Create list of built packages run: | From bc7e6f0df2f126552cddba055a99125041f08eba Mon Sep 17 00:00:00 2001 From: Andrey Filipenkov Date: Wed, 10 Dec 2025 16:46:55 +0300 Subject: [PATCH 2/2] !temp save Conan JSON files --- .github/workflows/rebuildDependencies.yml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/.github/workflows/rebuildDependencies.yml b/.github/workflows/rebuildDependencies.yml index 1221bd3..88d7f22 100644 --- a/.github/workflows/rebuildDependencies.yml +++ b/.github/workflows/rebuildDependencies.yml @@ -232,9 +232,8 @@ jobs: $CONAN_PROFILES \ ${{ matrix.conan_options }} \ --format=json \ - --build=never \ + --build="*" \ --no-remote \ - --conf:all="tools.graph:skip_binaries=False" \ > "$graphFile" conan list \ --graph "$graphFile" \ @@ -242,6 +241,13 @@ jobs: --format=json \ > "$packageListFile" conan remove --list "$packageListFile" --confirm + - name: Upload JSON graphs + uses: actions/upload-artifact@v4 + with: + name: JSON graphs ${{ matrix.platform }} + path: | + graph.json + pkglist.json - name: Create list of built packages run: |