Skip to content

Commit f3514c8

Browse files
committed
v13.x
1 parent 138612e commit f3514c8

File tree

3 files changed

+3
-5
lines changed

3 files changed

+3
-5
lines changed

.github/workflows/build_dependencies.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -84,14 +84,14 @@ jobs:
8484
if: ${{ inputs.testing == 'False' }}
8585

8686
- name: Setup Conan
87-
uses: ebay/sisl/.github/actions/setup_conan2@dev/v13.x
87+
uses: ebay/sisl/.github/actions/setup_conan2@master
8888
with:
8989
platform: ${{ inputs.platform }}
9090
if: ${{ inputs.testing == 'True' || steps.restore-cache.outputs.cache-hit != 'true' }}
9191

9292
- name: Load Conan Cache
9393
id: restore-cache
94-
uses: ebay/sisl/.github/actions/load_conan2@dev/v13.x
94+
uses: ebay/sisl/.github/actions/load_conan2@master
9595
with:
9696
testing: ${{ inputs.testing }}
9797
key_prefix: SislDeps13-${{ inputs.platform }}-${{ inputs.build-type }}-${{ inputs.malloc-impl }}
@@ -113,7 +113,7 @@ jobs:
113113
if: ${{ steps.restore-cache.outputs.cache-hit != 'true' }}
114114

115115
- name: Save Conan Cache
116-
uses: ebay/sisl/.github/actions/store_conan2@dev/v13.x
116+
uses: ebay/sisl/.github/actions/store_conan2@master
117117
with:
118118
key_prefix: SislDeps13-${{ inputs.platform }}-${{ inputs.build-type }}-${{ inputs.malloc-impl }}
119119
if: ${{ github.event_name != 'pull_request' && steps.restore-cache.outputs.cache-hit != 'true' }}

.github/workflows/merge_build.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ on:
44
workflow_dispatch:
55
push:
66
branches:
7-
- dev/v13.x
87
- stable/v12.x
98
- master
109

.github/workflows/pr_build.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ on:
44
workflow_dispatch:
55
pull_request:
66
branches:
7-
- dev/v13.x
87
- stable/v12.x
98
- master
109

0 commit comments

Comments
 (0)