From ede0d9b59b987758c7aa81bd47085d8967585ec5 Mon Sep 17 00:00:00 2001 From: sbinmalek Date: Tue, 26 May 2026 13:48:05 -0700 Subject: [PATCH 1/2] Fix remaining @master refs in build_dependencies workflow Update all ebay/sisl action refs from @master to @stable/v13.x, nuraft_mesg checkout from main to stable/v4.x, and HomeStore checkout from master to stable/v7.x. Drop --user oss --channel flags from conan export commands to match the channel-less requirements in conanfile.py. Co-Authored-By: Claude Sonnet 4.6 --- .github/workflows/build_dependencies.yml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/build_dependencies.yml b/.github/workflows/build_dependencies.yml index 3a30f66..1e44429 100644 --- a/.github/workflows/build_dependencies.yml +++ b/.github/workflows/build_dependencies.yml @@ -84,27 +84,27 @@ jobs: if: ${{ inputs.testing == 'False' }} - name: Setup Conan - uses: ebay/sisl/.github/actions/setup_conan2@master + uses: ebay/sisl/.github/actions/setup_conan2@stable/v13.x with: platform: ${{ inputs.platform }} if: ${{ inputs.testing == 'True' || steps.restore-cache.outputs.cache-hit != 'true' }} - name: Load HomeBlocks Cache id: restore-cache - uses: eBay/sisl/.github/actions/load_conan2@master + uses: eBay/sisl/.github/actions/load_conan2@stable/v13.x with: testing: ${{ inputs.testing }} key_prefix: HomeBlocksDeps-${{ inputs.platform }}-${{ inputs.build-type }}-${{ inputs.malloc-impl }} - name: Load Sisl Cache - uses: eBay/sisl/.github/actions/load_conan2@master + uses: eBay/sisl/.github/actions/load_conan2@stable/v13.x with: load_any: 'True' key_prefix: SislDeps13-${{ inputs.platform }}-${{ inputs.build-type }}-${{ inputs.malloc-impl }} if: ${{ inputs.testing == 'True' || steps.restore-cache.outputs.cache-hit != 'true' }} - name: Load IOMgr Cache - uses: eBay/sisl/.github/actions/load_conan2@master + uses: eBay/sisl/.github/actions/load_conan2@stable/v13.x with: load_any: 'True' key_prefix: IOMgrDeps-${{ inputs.platform }}-${{ inputs.build-type }}-${{ inputs.malloc-impl }}-False @@ -115,11 +115,11 @@ jobs: with: repository: eBay/nuraft_mesg path: import/nuraft_mesg - ref: main + ref: stable/v4.x if: ${{ inputs.testing == 'True' || steps.restore-cache.outputs.cache-hit != 'true' }} - name: Load NuRaftMesg Cache - uses: eBay/sisl/.github/actions/load_conan2@master + uses: eBay/sisl/.github/actions/load_conan2@stable/v13.x with: testing: 'False' path: import/nuraft_mesg @@ -132,11 +132,11 @@ jobs: with: repository: eBay/HomeStore path: import/homestore - ref: master + ref: stable/v7.x if: ${{ inputs.testing == 'True' || steps.restore-cache.outputs.cache-hit != 'true' }} - name: Load HomeStore Cache - uses: eBay/sisl/.github/actions/load_conan2@master + uses: eBay/sisl/.github/actions/load_conan2@stable/v13.x with: testing: 'False' path: import/homestore @@ -149,8 +149,8 @@ jobs: run: | sudo apt-get install -y python3-pyelftools libaio-dev python -m pip install pyelftools - conan export --user oss --channel master import/homestore - conan export --user oss --channel main import/nuraft_mesg + conan export import/homestore + conan export import/nuraft_mesg if: ${{ inputs.testing == 'True' || steps.restore-cache.outputs.cache-hit != 'true' }} - name: Create and Test Package @@ -170,7 +170,7 @@ jobs: if: ${{ inputs.testing == 'True' && inputs.tooling != 'Coverage' }} - name: Save Conan Cache - uses: eBay/sisl/.github/actions/store_conan2@master + uses: eBay/sisl/.github/actions/store_conan2@stable/v13.x with: key_prefix: HomeBlocksDeps-${{ inputs.platform }}-${{ inputs.build-type }}-${{ inputs.malloc-impl }} if: ${{ github.event_name != 'pull_request' && steps.restore-cache.outputs.cache-hit != 'true' && inputs.tooling != 'Coverage'}} From 07b30c719c2c275ce1b7521bbe746b7990bacc07 Mon Sep 17 00:00:00 2001 From: Brian Szmyd Date: Tue, 26 May 2026 14:50:11 -0600 Subject: [PATCH 2/2] Fix workflow --- .github/workflows/build_dependencies.yml | 105 +++++++++++++++++------ 1 file changed, 77 insertions(+), 28 deletions(-) diff --git a/.github/workflows/build_dependencies.yml b/.github/workflows/build_dependencies.yml index 3a30f66..9f12e34 100644 --- a/.github/workflows/build_dependencies.yml +++ b/.github/workflows/build_dependencies.yml @@ -71,55 +71,55 @@ jobs: runs-on: ${{ inputs.platform }} steps: - name: Retrieve Code - uses: actions/checkout@main + uses: actions/checkout@v4 with: ref: ${{ inputs.branch }} if: ${{ inputs.testing == 'True' }} - name: Retrieve Recipe - uses: actions/checkout@main + uses: actions/checkout@v4 with: repository: eBay/HomeBlocks ref: ${{ inputs.branch }} if: ${{ inputs.testing == 'False' }} - name: Setup Conan - uses: ebay/sisl/.github/actions/setup_conan2@master + uses: ebay/sisl/.github/actions/setup_conan2@stable/v13.x with: platform: ${{ inputs.platform }} if: ${{ inputs.testing == 'True' || steps.restore-cache.outputs.cache-hit != 'true' }} - name: Load HomeBlocks Cache id: restore-cache - uses: eBay/sisl/.github/actions/load_conan2@master + uses: eBay/sisl/.github/actions/load_conan2@stable/v13.x with: testing: ${{ inputs.testing }} key_prefix: HomeBlocksDeps-${{ inputs.platform }}-${{ inputs.build-type }}-${{ inputs.malloc-impl }} - name: Load Sisl Cache - uses: eBay/sisl/.github/actions/load_conan2@master + uses: eBay/sisl/.github/actions/load_conan2@stable/v13.x with: load_any: 'True' key_prefix: SislDeps13-${{ inputs.platform }}-${{ inputs.build-type }}-${{ inputs.malloc-impl }} if: ${{ inputs.testing == 'True' || steps.restore-cache.outputs.cache-hit != 'true' }} - name: Load IOMgr Cache - uses: eBay/sisl/.github/actions/load_conan2@master + uses: eBay/sisl/.github/actions/load_conan2@stable/v13.x with: load_any: 'True' key_prefix: IOMgrDeps-${{ inputs.platform }}-${{ inputs.build-type }}-${{ inputs.malloc-impl }}-False if: ${{ inputs.testing == 'True' || steps.restore-cache.outputs.cache-hit != 'true' }} - name: Retrieve Dependencies NuRaftMesg - uses: actions/checkout@main + uses: actions/checkout@v4 with: repository: eBay/nuraft_mesg path: import/nuraft_mesg - ref: main + ref: stable/v4.x if: ${{ inputs.testing == 'True' || steps.restore-cache.outputs.cache-hit != 'true' }} - name: Load NuRaftMesg Cache - uses: eBay/sisl/.github/actions/load_conan2@master + uses: eBay/sisl/.github/actions/load_conan2@stable/v13.x with: testing: 'False' path: import/nuraft_mesg @@ -128,15 +128,15 @@ jobs: if: ${{ inputs.testing == 'True' || steps.restore-cache.outputs.cache-hit != 'true' }} - name: Retrieve Dependencies HomeStore - uses: actions/checkout@main + uses: actions/checkout@v4 with: repository: eBay/HomeStore path: import/homestore - ref: master + ref: stable/v7.x if: ${{ inputs.testing == 'True' || steps.restore-cache.outputs.cache-hit != 'true' }} - name: Load HomeStore Cache - uses: eBay/sisl/.github/actions/load_conan2@master + uses: eBay/sisl/.github/actions/load_conan2@stable/v13.x with: testing: 'False' path: import/homestore @@ -149,50 +149,99 @@ jobs: run: | sudo apt-get install -y python3-pyelftools libaio-dev python -m pip install pyelftools - conan export --user oss --channel master import/homestore - conan export --user oss --channel main import/nuraft_mesg + conan export import/homestore + conan export import/nuraft_mesg if: ${{ inputs.testing == 'True' || steps.restore-cache.outputs.cache-hit != 'true' }} - - name: Create and Test Package + - name: Build Cache run: | - sanitize=$([[ "${{ inputs.tooling }}" == "Sanitize" ]] && echo "True" || echo "False") - conan build \ + pre=$([[ "${{ inputs.build-type }}" != "Debug" ]] && echo "-o iomgr/*:prerelease=${{ inputs.prerelease }}" || echo "") + echo "Disk space usage" + sudo df -h + sudo ls -l /tmp + sudo rm -rf $ANDROID_HOME + echo "Disk space usage after cleanup" + sudo df -h + conan install \ + -c tools.build:skip_test=True \ + ${pre} \ -o sisl/*:malloc_impl=${{ inputs.malloc-impl }} \ -o iomgr/*:testing=off \ -o homestore/*:testing=off \ - -o homeblocks/*:sanitize=${sanitize} \ -s:h build_type=${{ inputs.build-type }} \ - -s:h compiler.cppstd=23 \ + -c tools.build:skip_test=True \ --format=json \ --build missing \ . > ~/build.json conan list --graph ~/build.json --graph-binaries=build --format=json > ~/pkglist.json - if: ${{ inputs.testing == 'True' && inputs.tooling != 'Coverage' }} + if: ${{ steps.restore-cache.outputs.cache-hit != 'true' }} - name: Save Conan Cache - uses: eBay/sisl/.github/actions/store_conan2@master + uses: eBay/sisl/.github/actions/store_conan2@stable/v13.x with: - key_prefix: HomeBlocksDeps-${{ inputs.platform }}-${{ inputs.build-type }}-${{ inputs.malloc-impl }} - if: ${{ github.event_name != 'pull_request' && steps.restore-cache.outputs.cache-hit != 'true' && inputs.tooling != 'Coverage'}} + key_prefix: HomeObjectDeps-${{ inputs.platform }}-${{ inputs.build-type }}-${{ inputs.malloc-impl }}-${{ inputs.prerelease }} + if: ${{ github.event_name != 'pull_request' && steps.restore-cache.outputs.cache-hit != 'true' }} + + - name: Reload Sisl Cache + uses: eBay/sisl/.github/actions/load_conan2@stable/v13.x + with: + load_any: 'True' + key_prefix: SislDeps13-${{ inputs.platform }}-${{ inputs.build-type }}-${{ inputs.malloc-impl }} + if: ${{ inputs.testing == 'True' && github.event_name != 'pull_request' && steps.restore-cache.outputs.cache-hit != 'true' }} + + - name: Reload IOMgr Cache + uses: eBay/sisl/.github/actions/load_conan2@stable/v13.x + with: + load_any: 'True' + key_prefix: IOMgrDeps-${{ inputs.platform }}-${{ inputs.build-type }}-${{ inputs.malloc-impl }}-${{ inputs.prerelease }} + if: ${{ inputs.testing == 'True' && github.event_name != 'pull_request' && steps.restore-cache.outputs.cache-hit != 'true' }} + + - name: Reload NuRaftMesg Cache + uses: eBay/sisl/.github/actions/load_conan2@stable/v13.x + with: + testing: 'False' + path: import/nuraft_mesg + key_prefix: NuMesgDeps-${{ inputs.platform }}-${{ inputs.build-type }}-${{ inputs.malloc-impl }} + fail_on_cache_miss: true + if: ${{ inputs.testing == 'True' && github.event_name != 'pull_request' && steps.restore-cache.outputs.cache-hit != 'true' }} + + - name: Reload HomeStore Cache + uses: eBay/sisl/.github/actions/load_conan2@stable/v13.x + with: + testing: 'False' + path: import/homestore + key_prefix: HomestoreDeps-${{ inputs.platform }}-${{ inputs.build-type }}-${{ inputs.malloc-impl }}-${{ inputs.prerelease }} + fail_on_cache_miss: true + if: ${{ inputs.testing == 'True' && github.event_name != 'pull_request' && steps.restore-cache.outputs.cache-hit != 'true' }} + + - name: Create and Test Package + run: | + sanitize=$([[ "${{ inputs.tooling }}" == "Sanitize" ]] && echo "True" || echo "False") + conan create \ + -o sisl/*:malloc_impl=${{ inputs.malloc-impl }} \ + -o iomgr/*:testing=off \ + -o homestore/*:testing=off \ + -o homeblocks/*:sanitize=${sanitize} \ + -s:h build_type=${{ inputs.build-type }} \ + --build missing \ + . + if: ${{ inputs.testing == 'True' && inputs.tooling != 'Coverage' }} - name: Code Coverage Run run: | - python -m pip install gcovr conan build \ -o sisl/*:malloc_impl=${{ inputs.malloc-impl }} \ -o iomgr/*:testing=off \ -o homestore/*:testing=off \ -o homeblocks/*:coverage=True \ -s:h build_type=${{ inputs.build-type }} \ - -s:h compiler.cppstd=23 \ --build missing \ . - gcovr --cobertura ./coverage.xml if: ${{ inputs.testing == 'True' && inputs.tooling == 'Coverage' }} - name: Upload coverage reports to Codecov uses: codecov/codecov-action@v5 with: - files: ./coverage.xml - disable_search: true + token: ${{ secrets.CODECOV_TOKEN }} + verbose: true if: ${{ inputs.testing == 'True' && inputs.tooling == 'Coverage' }}