Skip to content

Commit 99d1cf6

Browse files
authored
fix: cancel-workflow and ensure assets are encrypted for showcases (#5157)
1 parent bc70a59 commit 99d1cf6

File tree

4 files changed

+22
-68
lines changed

4 files changed

+22
-68
lines changed

.github/workflows/00-cancel-workflow.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@ jobs:
1313
name: Cancel Workflow
1414
runs-on: ubuntu-24.04 # Use Ubuntu 24.04 explicitly
1515
steps:
16+
- name: ⏬ Checkout repo
17+
uses: actions/checkout@v5
18+
1619
- name: 💀 Killing me softly
1720
run: |
1821
gh run cancel ${{ github.run_id }}

.github/workflows/01-build-patternhub.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,8 @@ jobs:
9393
ASSET_PASSWORD: ${{ secrets.ASSET_PASSWORD }}
9494
NEXT_PUBLIC_BASE_PATH: ${{ steps.base-path.outputs.result }}
9595
run: |
96+
node node_modules/@db-ux/db-theme-fonts/build/scripts/index.js
97+
node node_modules/@db-ux/db-theme-icons/build/scripts/index.js
9698
npx --no tsx scripts/md-resolve-svg.ts
9799
npm run build --workspace=patternhub
98100
echo "path=${NEXT_PUBLIC_BASE_PATH}" >> $GITHUB_OUTPUT

.github/workflows/01-build-showcases.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,10 @@ jobs:
4444
env:
4545
ASSET_INIT_VECTOR: ${{ secrets.ASSET_INIT_VECTOR }}
4646
ASSET_PASSWORD: ${{ secrets.ASSET_PASSWORD }}
47-
run: npm run build --workspace=${{ inputs.showcase }}
47+
run: |
48+
node node_modules/@db-ux/db-theme-fonts/build/scripts/index.js
49+
node node_modules/@db-ux/db-theme-icons/build/scripts/index.js
50+
npm run build --workspace=${{ inputs.showcase }}
4851
4952
- name: ⏫ Upload ${{ inputs.showcase }}
5053
uses: actions/upload-artifact@v4

.github/workflows/default.yml

Lines changed: 13 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,6 @@ jobs:
3131
uses: ./.github/workflows/00-init.yml
3232
secrets: inherit
3333

34-
cancel-init:
35-
if: ${{ needs.init.result == 'failure' }}
36-
uses: ./.github/workflows/00-cancel-workflow.yml
37-
secrets: inherit
38-
needs: [init]
39-
4034
scan-secrets:
4135
if: github.event.pull_request == null || github.event.pull_request.head.repo.owner.login == 'db-ux-design-system'
4236
uses: ./.github/workflows/00-scan-secrets.yml
@@ -45,18 +39,12 @@ jobs:
4539
uses: ./.github/workflows/01-get-playwright-version.yml
4640
needs: [init]
4741

48-
cancel-on-failure-get-playwright-version:
49-
if: ${{ needs.get-playwright-version.result == 'failure' }}
50-
uses: ./.github/workflows/00-cancel-workflow.yml
51-
secrets: inherit
52-
needs: [get-playwright-version]
53-
5442
lint:
5543
uses: ./.github/workflows/01-lint.yml
5644
needs: [init]
5745

5846
cancel-on-failure-lint:
59-
if: ${{ needs.lint.result == 'failure' }}
47+
if: ${{ !cancelled() && needs.lint.result == 'failure' }}
6048
uses: ./.github/workflows/00-cancel-workflow.yml
6149
secrets: inherit
6250
needs: [lint]
@@ -66,7 +54,7 @@ jobs:
6654
needs: [init]
6755

6856
cancel-on-failure-test:
69-
if: ${{ needs.test.result == 'failure' }}
57+
if: ${{ !cancelled() && needs.test.result == 'failure' }}
7058
uses: ./.github/workflows/00-cancel-workflow.yml
7159
secrets: inherit
7260
needs: [test]
@@ -76,7 +64,7 @@ jobs:
7664
needs: [init]
7765

7866
cancel-on-failure-build-packages:
79-
if: ${{ needs.build-packages.result == 'failure' }}
67+
if: ${{ !cancelled() && needs.build-packages.result == 'failure' }}
8068
uses: ./.github/workflows/00-cancel-workflow.yml
8169
secrets: inherit
8270
needs: [build-packages]
@@ -88,7 +76,7 @@ jobs:
8876
version: ${{ needs.get-playwright-version.outputs.version }}
8977

9078
cancel-on-failure-init-playwright:
91-
if: ${{ needs.init-playwright.result == 'failure' }}
79+
if: ${{ !cancelled() && needs.init-playwright.result == 'failure' }}
9280
uses: ./.github/workflows/00-cancel-workflow.yml
9381
secrets: inherit
9482
needs: [init-playwright]
@@ -98,7 +86,7 @@ jobs:
9886
needs: [build-packages]
9987

10088
cancel-on-failure-build-outputs:
101-
if: ${{ needs.build-outputs.result == 'failure' }}
89+
if: ${{ !cancelled() && needs.build-outputs.result == 'failure' }}
10290
uses: ./.github/workflows/00-cancel-workflow.yml
10391
secrets: inherit
10492
needs: [build-outputs]
@@ -109,32 +97,20 @@ jobs:
10997
with:
11098
version: ${{ needs.get-playwright-version.outputs.version }}
11199

112-
cancel-on-failure-test-components:
113-
if: ${{ needs.test-components.result == 'failure' }}
114-
uses: ./.github/workflows/00-cancel-workflow.yml
115-
secrets: inherit
116-
needs: [test-components]
117-
118100
test-foundations:
119101
uses: ./.github/workflows/02-e2e-foundations.yml
120102
needs: [build-packages, get-playwright-version]
121103
with:
122104
version: ${{ needs.get-playwright-version.outputs.version }}
123105

124-
cancel-on-failure-test-foundations:
125-
if: ${{ needs.test-foundations.result == 'failure' }}
126-
uses: ./.github/workflows/00-cancel-workflow.yml
127-
secrets: inherit
128-
needs: [test-foundations]
129-
130106
build-showcase-stencil:
131107
uses: ./.github/workflows/01-build-showcases.yml
132108
needs: [build-packages]
133109
with:
134110
showcase: stencil-showcase
135111

136112
cancel-on-failure-build-showcase-stencil:
137-
if: ${{ needs.build-showcase-stencil.result == 'failure' }}
113+
if: ${{ !cancelled() && needs.build-showcase-stencil.result == 'failure' }}
138114
uses: ./.github/workflows/00-cancel-workflow.yml
139115
secrets: inherit
140116
needs: [build-showcase-stencil]
@@ -146,7 +122,7 @@ jobs:
146122
showcase: angular-showcase
147123

148124
cancel-on-failure-build-showcase-angular:
149-
if: ${{ needs.build-showcase-angular.result == 'failure' }}
125+
if: ${{ !cancelled() && needs.build-showcase-angular.result == 'failure' }}
150126
uses: ./.github/workflows/00-cancel-workflow.yml
151127
secrets: inherit
152128
needs: [build-showcase-angular]
@@ -158,7 +134,7 @@ jobs:
158134
showcase: angular-ssr-showcase
159135

160136
cancel-on-failure-build-showcase-angular-ssr:
161-
if: ${{ needs.build-showcase-angular-ssr.result == 'failure' }}
137+
if: ${{ !cancelled() && needs.build-showcase-angular-ssr.result == 'failure' }}
162138
uses: ./.github/workflows/00-cancel-workflow.yml
163139
secrets: inherit
164140
needs: [build-showcase-angular-ssr]
@@ -170,7 +146,7 @@ jobs:
170146
showcase: react-showcase
171147

172148
cancel-on-failure-build-showcase-react:
173-
if: ${{ needs.build-showcase-react.result == 'failure' }}
149+
if: ${{ !cancelled() && needs.build-showcase-react.result == 'failure' }}
174150
uses: ./.github/workflows/00-cancel-workflow.yml
175151
secrets: inherit
176152
needs: [build-showcase-react]
@@ -182,7 +158,7 @@ jobs:
182158
showcase: next-showcase
183159

184160
cancel-on-failure-build-showcase-next:
185-
if: ${{ needs.build-showcase-next.result == 'failure' }}
161+
if: ${{ !cancelled() && needs.build-showcase-next.result == 'failure' }}
186162
uses: ./.github/workflows/00-cancel-workflow.yml
187163
secrets: inherit
188164
needs: [build-showcase-next]
@@ -194,7 +170,7 @@ jobs:
194170
showcase: vue-showcase
195171

196172
cancel-on-failure-build-showcase-vue:
197-
if: ${{ needs.build-showcase-vue.result == 'failure' }}
173+
if: ${{ !cancelled() && needs.build-showcase-vue.result == 'failure' }}
198174
uses: ./.github/workflows/00-cancel-workflow.yml
199175
secrets: inherit
200176
needs: [build-showcase-vue]
@@ -206,7 +182,7 @@ jobs:
206182
showcase: nuxt-showcase
207183

208184
cancel-on-failure-build-showcase-nuxt:
209-
if: ${{ needs.build-showcase-nuxt.result == 'failure' }}
185+
if: ${{ !cancelled() && needs.build-showcase-nuxt.result == 'failure' }}
210186
uses: ./.github/workflows/00-cancel-workflow.yml
211187
secrets: inherit
212188
needs: [build-showcase-nuxt]
@@ -216,7 +192,7 @@ jobs:
216192
needs: [build-packages]
217193

218194
cancel-on-failure-build-showcase-patternhub:
219-
if: ${{ needs.build-showcase-patternhub.result == 'failure' }}
195+
if: ${{ !cancelled() && needs.build-showcase-patternhub.result == 'failure' }}
220196
uses: ./.github/workflows/00-cancel-workflow.yml
221197
secrets: inherit
222198
needs: [build-showcase-patternhub]
@@ -228,64 +204,34 @@ jobs:
228204
version: ${{ needs.get-playwright-version.outputs.version }}
229205
showcase: stencil-showcase
230206

231-
cancel-on-failure-test-showcase-stencil:
232-
if: ${{ needs.test-showcase-stencil.result == 'failure' }}
233-
uses: ./.github/workflows/00-cancel-workflow.yml
234-
secrets: inherit
235-
needs: [test-showcase-stencil]
236-
237207
test-showcase-angular:
238208
uses: ./.github/workflows/02-e2e-showcases.yml
239209
needs: [build-showcase-angular, get-playwright-version]
240210
with:
241211
version: ${{ needs.get-playwright-version.outputs.version }}
242212
showcase: angular-showcase
243213

244-
cancel-on-failure-test-showcase-angular:
245-
if: ${{ needs.test-showcase-angular.result == 'failure' }}
246-
uses: ./.github/workflows/00-cancel-workflow.yml
247-
secrets: inherit
248-
needs: [test-showcase-angular]
249-
250214
test-showcase-react:
251215
uses: ./.github/workflows/02-e2e-showcases.yml
252216
needs: [build-showcase-react, get-playwright-version]
253217
with:
254218
version: ${{ needs.get-playwright-version.outputs.version }}
255219
showcase: react-showcase
256220

257-
cancel-on-failure-test-showcase-react:
258-
if: ${{ needs.test-showcase-react.result == 'failure' }}
259-
uses: ./.github/workflows/00-cancel-workflow.yml
260-
secrets: inherit
261-
needs: [test-showcase-react]
262-
263221
test-showcase-vue:
264222
uses: ./.github/workflows/02-e2e-showcases.yml
265223
needs: [build-showcase-vue, get-playwright-version]
266224
with:
267225
version: ${{ needs.get-playwright-version.outputs.version }}
268226
showcase: vue-showcase
269227

270-
cancel-on-failure-test-showcase-vue:
271-
if: ${{ needs.test-showcase-vue.result == 'failure' }}
272-
uses: ./.github/workflows/00-cancel-workflow.yml
273-
secrets: inherit
274-
needs: [test-showcase-vue]
275-
276228
test-showcase-patternhub:
277229
uses: ./.github/workflows/02-e2e-patternhub.yml
278230
needs: [build-showcase-patternhub, get-playwright-version]
279231
with:
280232
version: ${{ needs.get-playwright-version.outputs.version }}
281233
path: ${{ needs.build-showcase-patternhub.outputs.path }}
282234

283-
cancel-on-failure-test-showcase-patternhub:
284-
if: ${{ needs.test-showcase-patternhub.result == 'failure' }}
285-
uses: ./.github/workflows/00-cancel-workflow.yml
286-
secrets: inherit
287-
needs: [test-showcase-patternhub]
288-
289235
regenerate-snapshots-components:
290236
if: ${{ !cancelled() && needs.test-components.result == 'failure' }}
291237
uses: ./.github/workflows/02-e2e-regenerate.yml

0 commit comments

Comments
 (0)