From 28548ff5a884b108543f7094c9574a6bc9592a20 Mon Sep 17 00:00:00 2001 From: Brian Szmyd Date: Wed, 3 Jan 2024 17:08:59 +0000 Subject: [PATCH] Cache SISL 11 --- .github/workflows/build_commit.yml | 8 ++++---- .github/workflows/build_dependencies.yml | 4 ++-- conanfile.py | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build_commit.yml b/.github/workflows/build_commit.yml index 6d5870aa3..761d6687b 100644 --- a/.github/workflows/build_commit.yml +++ b/.github/workflows/build_commit.yml @@ -20,10 +20,10 @@ on: type: string jobs: - Sisl10Deps: - uses: eBay/sisl/.github/workflows/build_dependencies.yml@stable/v10.x + SislDeps: + uses: eBay/sisl/.github/workflows/build_dependencies.yml@master with: - branch: stable/v10.x + branch: master platform: ${{ inputs.platform }} build-type: ${{ inputs.build-type }} malloc-impl: ${{ inputs.malloc-impl }} @@ -32,7 +32,7 @@ jobs: if: ${{ github.event_name != 'pull_request' }} IOMgrDeps: - needs: Sisl10Deps + needs: SislDeps uses: eBay/iomanager/.github/workflows/build_dependencies.yml@master with: branch: master diff --git a/.github/workflows/build_dependencies.yml b/.github/workflows/build_dependencies.yml index 5d74d5250..4ffac8419 100644 --- a/.github/workflows/build_dependencies.yml +++ b/.github/workflows/build_dependencies.yml @@ -108,7 +108,7 @@ jobs: uses: eBay/sisl/.github/actions/load_conan@stable/v8.x with: load_any: 'True' - key_prefix: Sisl10Deps-${{ inputs.platform }}-${{ inputs.build-type }}-${{ inputs.malloc-impl }}-${{ inputs.prerelease }} + key_prefix: SislDeps-${{ inputs.platform }}-${{ inputs.build-type }}-${{ inputs.malloc-impl }}-${{ inputs.prerelease }} if: ${{ inputs.testing == 'True' || steps.restore-cache.outputs.cache-hit != 'true' }} - name: Retrieve Dependencies @@ -166,7 +166,7 @@ jobs: uses: eBay/sisl/.github/actions/load_conan@stable/v8.x with: load_any: 'True' - key_prefix: Sisl10Deps-${{ inputs.platform }}-${{ inputs.build-type }}-${{ inputs.malloc-impl }}-${{ inputs.prerelease }} + key_prefix: SislDeps-${{ 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 IOMgr Cache diff --git a/conanfile.py b/conanfile.py index bf4ffbe20..df054f24f 100644 --- a/conanfile.py +++ b/conanfile.py @@ -55,8 +55,8 @@ def build_requirements(self): self.build_requires("gtest/1.14.0") def requirements(self): - self.requires("iomgr/[~=10, include_prerelease=True]@oss/master") - self.requires("sisl/[>=10.3]") + self.requires("iomgr/[~=11, include_prerelease=True]@oss/master") + self.requires("sisl/[~=11, include_prerelease=True]@oss/master") self.requires("farmhash/cci.20190513@") if self.settings.arch in ['x86', 'x86_64']: