Skip to content

Commit 02d9158

Browse files
committed
More fixes for bundling Dawn in CI
1 parent 467f2fc commit 02d9158

File tree

1 file changed

+5
-28
lines changed

1 file changed

+5
-28
lines changed

.github/workflows/dawn.yaml

Lines changed: 5 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -103,14 +103,6 @@ jobs:
103103
run: |
104104
sudo apt-get update
105105
sudo apt-get install -y build-essential clang cmake curl git gnupg2 libcurl4-openssl-dev libpython3-dev libssl-dev libx11-xcb-dev libxcursor-dev libxi-dev libxinerama-dev libxml2-dev libxrandr-dev libz-dev libz3-dev mesa-common-dev ninja-build pkg-config python3 python3-pip python3-venv tzdata unzip wget
106-
echo "c_compiler=clang" >> "$GITHUB_OUTPUT"
107-
echo "cxx_compiler=clang++" >> "$GITHUB_OUTPUT"
108-
109-
- name: Install prerequisites on Mac
110-
if: matrix.platform == 'macos-latest'
111-
run: |
112-
echo "c_compiler=clang" >> "$GITHUB_OUTPUT"
113-
echo "cxx_compiler=clang++" >> "$GITHUB_OUTPUT"
114106
115107
- name: Set up Python
116108
uses: actions/setup-python@v5
@@ -130,9 +122,6 @@ jobs:
130122
path: Dawn/dawn_source/
131123

132124
- name: Build Dawn for ${{ matrix.target }}
133-
env:
134-
CC: ${{ env.c_compiler }}
135-
CXX: ${{ env.cxx_compiler }}
136125
run: |
137126
cd Dawn
138127
python ci_build_dawn.py build-target --target ${{ matrix.target }}
@@ -144,13 +133,6 @@ jobs:
144133
path: Dawn/builds/
145134
retention-days: 1
146135

147-
- name: Upload build manifest
148-
uses: actions/upload-artifact@v4
149-
with:
150-
name: dawn-build-manifest-${{ matrix.target }}
151-
path: Dawn/builds/manifests/
152-
retention-days: 1
153-
154136
create-bundle:
155137
needs: [build-dawn, get-dawn-source]
156138
runs-on: ubuntu-latest
@@ -171,22 +153,16 @@ jobs:
171153
pip install -r requirements.txt
172154
173155
- name: Download all build artifacts
174-
uses: actions/download-artifact@v4
156+
uses: actions/download-artifact@v5
175157
with:
176158
path: Dawn/builds/
177159

178160
- name: Download Dawn version
179-
uses: actions/download-artifact@v4
161+
uses: actions/download-artifact@v5
180162
with:
181163
name: dawn-version
182164
path: Dawn
183165

184-
- name: Download build manifests
185-
uses: actions/download-artifact@v4
186-
with:
187-
name: dawn-build-manifest-${{ matrix.target }}
188-
path: Dawn/builds/manifests/
189-
190166
- name: Create artifact bundle
191167
run: |
192168
cd Dawn
@@ -209,10 +185,11 @@ jobs:
209185
uses: actions/checkout@v4
210186

211187
- name: Download bundle artifact
212-
uses: actions/download-artifact@v4
188+
uses: actions/download-artifact@v5
213189
with:
214-
name: dawn-webgpu-bundle
190+
pattern: dawn-build-*
215191
path: dawn-bundle/
192+
merge-multiple: true
216193

217194
- name: Compute SHA256
218195
run: |

0 commit comments

Comments
 (0)