Skip to content

Commit e6e46ba

Browse files
committed
More CI fixes for Dawn releases
1 parent c3e8924 commit e6e46ba

File tree

1 file changed

+22
-2
lines changed

1 file changed

+22
-2
lines changed

.github/workflows/dawn.yaml

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,15 @@ jobs:
4747
path: |
4848
Dawn/dawn_source/
4949
!Dawn/dawn_source/.git
50+
!Dawn/dawn_source/**/*.git
51+
!Dawn/dawn_source/third_party/khronos/OpenGL-Registry/specs
52+
retention-days: 1
53+
54+
- name: Upload Dawn Version
55+
uses: actions/upload-artifact@v4
56+
with:
57+
name: dawn-version
58+
path: Dawn/dawn_version.json
5059
retention-days: 1
5160

5261
- name: Read Dawn version
@@ -100,7 +109,6 @@ jobs:
100109
- name: Install prerequisites on Mac
101110
if: matrix.platform == 'macos-latest'
102111
run: |
103-
brew install ninja
104112
echo "c_compiler=clang" >> "$GITHUB_OUTPUT"
105113
echo "cxx_compiler=clang++" >> "$GITHUB_OUTPUT"
106114
@@ -160,6 +168,12 @@ jobs:
160168
with:
161169
path: Dawn/builds/
162170

171+
- name: Download Dawn version
172+
uses: actions/download-artifact@v4
173+
with:
174+
name: dawn-version
175+
path: Dawn/dawn_version.json
176+
163177
- name: Create artifact bundle
164178
run: |
165179
cd Dawn
@@ -187,12 +201,18 @@ jobs:
187201
name: dawn-webgpu-bundle
188202
path: dawn-bundle/
189203

204+
- name: Tag name
205+
run: |
206+
TAG="dawn-chromium-${{env.DAWN_CHANNEL}}-${{needs.get-dawn-source.outputs.chromium_dawn_version}}"
207+
echo "tag=$TAG" >> $GITHUB_OUTPUT
208+
190209
- name: Create Release
191210
uses: actions/create-release@v1
192211
env:
193212
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
194213
with:
195214
release_name: Dawn WebGPU from Chromium ${{ needs.get-dawn-source.outputs.chromium_dawn_version }}
215+
tag_name: ${{ needs.create-release.outputs.tag }}
196216
body: |
197217
Dawn WebGPU build matching Chromium ${{ needs.get-dawn-source.outputs.chromium_dawn_version }}.
198218
Built from Dawn hash: ${{ needs.get-dawn-source.outputs.chromium_dawn_hash }}
@@ -211,7 +231,7 @@ jobs:
211231

212232
- name: Upload Release Assets
213233
run: |
214-
TAG="dawn-chromium-${{env.DAWN_CHANNEL}}-${{needs.get-dawn-source.outputs.chromium_dawn_version}}"
234+
TAG="${{ needs.create-release.outputs.tag }}"
215235
if gh release view "$TAG" >/dev/null 2>&1; then
216236
echo "Release '$TAG' already exists. Skipping upload."
217237
else

0 commit comments

Comments
 (0)