diff --git a/.github/actions/setup_lfs/action.yml b/.github/actions/setup_lfs/action.yml index e65045956ca..b3c76be7977 100644 --- a/.github/actions/setup_lfs/action.yml +++ b/.github/actions/setup_lfs/action.yml @@ -1,6 +1,7 @@ name: "Setup LFS" description: "Pull LFS repositories and caches them" + inputs: refdata-repo: description: "tardis refdata repository" @@ -48,7 +49,7 @@ runs: - name: Save LFS cache if not found # uses fake ternary # for reference: https://github.com/orgs/community/discussions/26738#discussioncomment-3253176 - if: ${{ steps.lfs-cache-refdata.outputs.cache-hit != 'true' && always() || false }} + if: ${{ steps.lfs-cache-refdata.outputs.cache-hit != 'true' && !contains(github.ref, 'merge') && always() || false }} uses: actions/cache/save@v4 id: lfs-cache-refdata-save with: @@ -88,7 +89,7 @@ runs: - name: Save LFS cache if not found # uses fake ternary # for reference: https://github.com/orgs/community/discussions/26738#discussioncomment-3253176 - if: ${{ steps.lfs-cache-regression-data.outputs.cache-hit != 'true' && always() || false }} + if: ${{ steps.lfs-cache-regression-data.outputs.cache-hit != 'true' && !contains(github.ref, 'merge') && always() || false }} uses: actions/cache/save@v4 id: lfs-cache-regression-data-save with: diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 05fd1701fe8..a630dd81b61 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -61,7 +61,7 @@ jobs: verbose: true tests: - name: ${{ matrix.continuum }} continuum ${{ matrix.rpacket_tracking }} rpacket_tracking ${{ matrix.os }} ${{ inputs.pip_tests && 'pip tests enabled' || '' }} + name: ${{ matrix.continuum }} continuum ${{ matrix.rpacket_tracking }} rpacket_tracking ${{ matrix.os }} ${{ inputs.pip_git && 'pip tests enabled' || '' }} if: github.repository_owner == 'tardis-sn' runs-on: ${{ matrix.os }} strategy: