Skip to content

Commit 8b6562e

Browse files
Merge branch 'main' into refactor-extend-to-two-parallel-dependabot-prs
2 parents 34edc77 + 69f297d commit 8b6562e

File tree

22 files changed

+30
-27
lines changed

22 files changed

+30
-27
lines changed

.github/workflows/codeql.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ jobs:
5757
# your codebase is analyzed, see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/codeql-code-scanning-for-compiled-languages
5858
steps:
5959
- name: Checkout repository
60-
uses: actions/checkout@v4
60+
uses: actions/checkout@v5
6161

6262
# Add any setup steps before running the `github/codeql-action/init` action.
6363
# This includes steps like installing compilers or runtimes (`actions/setup-node`

.github/workflows/default.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -218,10 +218,12 @@ jobs:
218218
uses: ./.github/workflows/02-e2e-regenerated-snapshots-commit.yml
219219
secrets: inherit
220220
if: |
221-
needs.regenerate-snapshots-components.result == 'success' ||
222-
needs.regenerate-snapshots-foundations.result == 'success' ||
223-
needs.regenerate-snapshots-patternhub.result == 'success' ||
224-
needs.regenerate-snapshots.result == 'success'
221+
${{ !cancelled() &&
222+
( needs.regenerate-snapshots-components.result == 'success' ||
223+
needs.regenerate-snapshots-foundations.result == 'success' ||
224+
needs.regenerate-snapshots-patternhub.result == 'success' ||
225+
needs.regenerate-snapshots.result == 'success' )
226+
}}
225227
needs:
226228
[
227229
regenerate-snapshots-components,
Loading
110 Bytes
Loading
100 Bytes
Loading
-6 Bytes
Loading
-11 Bytes
Loading
-9 Bytes
Loading
-6 Bytes
Loading
-3 Bytes
Loading

0 commit comments

Comments
 (0)