diff --git a/.github/actions/load_conan/action.yml b/.github/actions/load_conan/action.yml index e4be901f..e630542f 100644 --- a/.github/actions/load_conan/action.yml +++ b/.github/actions/load_conan/action.yml @@ -7,7 +7,7 @@ inputs: key_prefix: description: 'Cache prefix' required: true - default: 'ForkDeps' + default: 'Deps' fail_on_cache_miss: description: 'Fail if key missing' required: false @@ -30,7 +30,8 @@ runs: - id: hash-key-primary shell: bash run: | - echo "key=${{ inputs.path }}/conanfile.py" >> $GITHUB_OUTPUT + grep "self.requires" ${{ inputs.path }}/conanfile.py > ${{ inputs.path }}/conan_dependencies.txt + echo "key=${{ inputs.path }}/conan_dependencies.txt" >> $GITHUB_OUTPUT - id: hash-key-3rd shell: bash diff --git a/.github/actions/store_conan/action.yml b/.github/actions/store_conan/action.yml index e36e7815..aff1513e 100644 --- a/.github/actions/store_conan/action.yml +++ b/.github/actions/store_conan/action.yml @@ -14,6 +14,7 @@ runs: rm -rf ~/.conan2/p/*/b ~/.conan2/p/*/s echo "Caching following packages" find ~/.conan2/p -type d -maxdepth 4 + grep "self.requires" conanfile.py > conan_dependencies.txt #if [ -d 3rd_party ]; then # dep_pkgs=$(ls -1d 3rd_party/* 2>/dev/null | cut -d'/' -f2 | paste -sd'|' - -) @@ -37,5 +38,5 @@ runs: with: path: | ~/.conan2/p - key: ${{ inputs.key_prefix }}-${{ hashFiles('conanfile.py', '3rd_party/**/conanfile.py') }} + key: ${{ inputs.key_prefix }}-${{ hashFiles('conan_dependencies.txt', '3rd_party/**/conanfile.py') }} diff --git a/.github/workflows/build_dependencies.yml b/.github/workflows/build_dependencies.yml index a4b568ac..7b8e07e3 100644 --- a/.github/workflows/build_dependencies.yml +++ b/.github/workflows/build_dependencies.yml @@ -135,7 +135,7 @@ jobs: - name: Create and Test Package run: | sanitize=$([[ "${{ inputs.tooling }}" == "Sanitize" ]] && echo "True" || echo "False") - skip_test=$([[ "${{ inputs.testing }}" == "True" || ${{ inputs.testing }} == "true" ]] && echo "false" || echo "true") + skip_test=$([[ "${{ inputs.testing }}" == "True" || ${{ inputs.testing }} == "true" ]] && echo "False" || echo "True") conan create \ -o "sisl/*:prerelease=${{ inputs.prerelease }}" \ -o "sisl/*:malloc_impl=${{ inputs.malloc-impl }}" \ diff --git a/.github/workflows/pr_build.yml b/.github/workflows/pr_build.yml index 4dddcfc2..c6af93fc 100644 --- a/.github/workflows/pr_build.yml +++ b/.github/workflows/pr_build.yml @@ -16,7 +16,7 @@ jobs: build-type: ["Debug", "Release"] malloc-impl: ["libc", "tcmalloc"] prerelease: ["True", "False"] - tooling: ["Sanitize", "Coverage", "None"] + tooling: ["Sanitize", "None"] exclude: - build-type: Debug prerelease: "False" @@ -30,8 +30,6 @@ jobs: malloc-impl: libc - build-type: Release tooling: Sanitize - - build-type: Release - tooling: Coverage uses: ./.github/workflows/build_dependencies.yml with: platform: ${{ matrix.platform }} diff --git a/conanfile.py b/conanfile.py index ef44a839..0e18787e 100644 --- a/conanfile.py +++ b/conanfile.py @@ -9,7 +9,7 @@ class SISLConan(ConanFile): name = "sisl" - version = "13.3.2" + version = "13.3.4" homepage = "https://github.com/hkadayam/sisl" description = "Library for fast data structures, utilities"