diff --git a/.github/workflows/build_commit.yml b/.github/workflows/build_commit.yml index 761d6687b..6d5870aa3 100644 --- a/.github/workflows/build_commit.yml +++ b/.github/workflows/build_commit.yml @@ -20,10 +20,10 @@ on: type: string jobs: - SislDeps: - uses: eBay/sisl/.github/workflows/build_dependencies.yml@master + Sisl10Deps: + uses: eBay/sisl/.github/workflows/build_dependencies.yml@stable/v10.x with: - branch: master + branch: stable/v10.x 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: SislDeps + needs: Sisl10Deps 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 4ffac8419..5d74d5250 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: SislDeps-${{ inputs.platform }}-${{ inputs.build-type }}-${{ inputs.malloc-impl }}-${{ inputs.prerelease }} + key_prefix: Sisl10Deps-${{ 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: SislDeps-${{ inputs.platform }}-${{ inputs.build-type }}-${{ inputs.malloc-impl }}-${{ inputs.prerelease }} + key_prefix: Sisl10Deps-${{ 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 c50de1b4c..e7eb39d25 100644 --- a/conanfile.py +++ b/conanfile.py @@ -56,7 +56,7 @@ def build_requirements(self): def requirements(self): self.requires("iomgr/[~=10, include_prerelease=True]@oss/master") - self.requires("sisl/[~=10, include_prerelease=True]@oss/master") + self.requires("sisl/[>10.3]") self.requires("farmhash/cci.20190513@") self.requires("isa-l/2.30.0")