Skip to content

Commit ca0e119

Browse files
committed
ci: separate build matrix from workflow
1 parent 03c85ff commit ca0e119

File tree

2 files changed

+16
-4
lines changed

2 files changed

+16
-4
lines changed

.github/workflows/build.yml

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ on:
2424
default: "20"
2525
experimental:
2626
required: false
27-
default: "false"
27+
default: false
2828
ref:
2929
description: "The branch or tag to checkout"
3030
required: false
@@ -154,6 +154,14 @@ jobs:
154154
exit 1
155155
fi
156156
157+
# If there are changes, capture the changes and upload them as an artifact
158+
- name: Capture changes
159+
if: ${{ failure() }}
160+
id: capture-changes
161+
run: |
162+
git diff
163+
git diff > changes.diff
164+
157165
- name: Upload changes
158166
if: ${{ failure() }}
159167
uses: actions/upload-artifact@v4

.github/workflows/development.yml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,13 @@ jobs:
5252
system:
5353
- macos-latest
5454
- ubuntu-latest
55-
# - windows-latest # todo: debug token style-dictionary failures on windows
5655
node-version:
5756
- 20
57+
experimental:
58+
- false
59+
include:
60+
- system: windows-latest
61+
experimental: true
5862
uses: ./.github/workflows/build.yml
5963
with:
6064
system: ${{ matrix.system }}
@@ -177,7 +181,7 @@ jobs:
177181
# -------------------------------------------------------------
178182
vrt:
179183
name: Testing
180-
if: contains(github.event.pull_request.labels.*.name, 'run_vrt') || ((github.event.pull_request.draft != true || contains(github.event.pull_request.labels.*.name, 'run_ci')) && github.event.pull_request.mergeable == true)
184+
if: ${{ contains(github.event.pull_request.labels.*.name, 'run_vrt') || ((github.event.pull_request.draft != true || contains(github.event.pull_request.labels.*.name, 'run_ci')) && github.event.pull_request.mergeable == true) }}
181185
uses: ./.github/workflows/vrt.yml
182186
with:
183187
skip: ${{ github.base_ref == 'spectrum-two' || contains(github.event.pull_request.labels.*.name, 'skip_vrt') }}
@@ -192,7 +196,7 @@ jobs:
192196
# The build step ensures we are leveraging the cache for the build
193197
needs: [vrt]
194198
# Note: the goal here is to allow vrt to be skipped but still require the build to succeed
195-
if: ${{ always() }}
199+
if: ${{ always() && (needs.vrt.result == 'success' || needs.vrt.result == 'skipped') }}
196200
uses: ./.github/workflows/publish-site.yml
197201
with:
198202
deploy-message: ${{ github.event.pull_request.title }}

0 commit comments

Comments
 (0)