Skip to content

Commit f676548

Browse files
committed
nrmalize artifacts
1 parent d3a18a1 commit f676548

1 file changed

Lines changed: 17 additions & 26 deletions

File tree

.github/workflows/ci.yml

Lines changed: 17 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,7 @@ permissions:
1111
id-token: write
1212

1313
# TODO: codegen before each step
14-
# TODO: publish dockers automatically (so they have up-to-date headers)
15-
# TODO: should I provide "sdk" releases for each cart-type?
14+
# TODO: publish dockers automatically in "release" (so they have up-to-date headers after codegen)
1615

1716
jobs:
1817
# TODO: seperate these into different steps and remove matrix?
@@ -36,15 +35,13 @@ jobs:
3635
sudo apt-get update
3736
sudo apt-get install -y --no-install-recommends libglfw3 libglfw3-dev libx11-dev libxcursor-dev libxrandr-dev libxinerama-dev libxi-dev libxext-dev libxfixes-dev libwayland-dev libwayland-bin libxkbcommon-dev zip
3837
cmake -B build -DCMAKE_BUILD_TYPE=Release
39-
cmake --build build --target host
40-
cd build/host
41-
zip ../../null0_linux_x86-64.zip null0
38+
cmake --build build --target host0
4239
- name: Upload Linux Host (x86_64) artifact
4340
if: matrix.container == false && matrix.arch == 'x86_64'
4441
uses: actions/upload-artifact@v4
4542
with:
46-
name: null0_host_linux_x86-64
47-
path: null0_linux_x86-64.zip
43+
name: host_linux_x86-64
44+
path: build/host/null0
4845

4946
- name: Build Linux Hosts (arm64) - X11/Wayland and DRM
5047
if: matrix.container == false && matrix.arch == 'arm64'
@@ -60,7 +57,6 @@ jobs:
6057
-DCMAKE_C_FLAGS="-Wno-unknown-warning-option -Wno-unused-command-line-argument" \
6158
-DCMAKE_CXX_FLAGS="-Wno-unknown-warning-option -Wno-unused-command-line-argument"
6259
cmake --build build_desktop --target host
63-
(cd build_desktop/host && zip ../../null0_linux_arm64.zip null0)
6460
# DRM build
6561
cmake -B build_drm -G Ninja -DCMAKE_BUILD_TYPE=Release \
6662
-DPLATFORM=DRM -DGRAPHICS=GRAPHICS_API_OPENGL_ES2 \
@@ -69,19 +65,18 @@ jobs:
6965
-DCMAKE_C_FLAGS="-Wno-unknown-warning-option -Wno-unused-command-line-argument" \
7066
-DCMAKE_CXX_FLAGS="-Wno-unknown-warning-option -Wno-unused-command-line-argument"
7167
cmake --build build_drm --target host
72-
(cd build_drm/host && zip ../../null0_linux_drm_arm64.zip null0)
7368
- name: Upload Linux Hosts (arm64) artifact
7469
if: matrix.container == false && matrix.arch == 'arm64'
7570
uses: actions/upload-artifact@v4
7671
with:
77-
name: null0_host_linux_arm64
78-
path: null0_linux_arm64.zip
72+
name: host_linux_arm64
73+
path: build_desktop/host/null0
7974
- name: Upload Linux Hosts (drm_arm64) artifact
8075
if: matrix.container == false && matrix.arch == 'arm64'
8176
uses: actions/upload-artifact@v4
8277
with:
83-
name: null0_host_linux_drm_arm64
84-
path: null0_linux_drm_arm64.zip
78+
name: host_linux_arm64_drm
79+
path: build_drm/host/null0
8580

8681
host_mac:
8782
runs-on: macos-14
@@ -101,13 +96,11 @@ jobs:
10196
mkdir -p build_universal
10297
lipo -create build_x86_64/host/null0 build_arm64/host/null0 -output build_universal/null0
10398
chmod +x build_universal/null0
104-
cd build_universal
105-
zip ../null0_macos.zip null0
10699
- name: Upload Mac Host artifact
107100
uses: actions/upload-artifact@v4
108101
with:
109-
name: null0_host_mac
110-
path: null0_macos.zip
102+
name: host_mac
103+
path: build_universal/null0
111104

112105
host_windows:
113106
runs-on: windows-latest
@@ -122,14 +115,12 @@ jobs:
122115
run: |
123116
cmake -B build -G Ninja -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_COMPILER=clang-cl -DCMAKE_CXX_COMPILER=clang-cl -DWAMR_BUILD_SIMD=0 -DWAMR_BUILD_INVOKE_NATIVE_GENERAL=1
124117
cmake --build build --target host
125-
cd build/host
126-
Compress-Archive -Path null0.exe -DestinationPath ../../null0_windows_x64.zip
127118
shell: pwsh
128119
- name: Upload Windows Host artifact
129120
uses: actions/upload-artifact@v4
130121
with:
131-
name: null0_host_windows
132-
path: null0_windows_x64.zip
122+
name: host_windows
123+
path: cd build/host/null0.exe
133124

134125
host_web:
135126
runs-on: windows-latest
@@ -145,7 +136,7 @@ jobs:
145136
- name: Upload Web Host artifact
146137
uses: actions/upload-artifact@v4
147138
with:
148-
name: null0_host_web
139+
name: host_web
149140
path: wbuild/host/null0.mjs
150141

151142
cart_c:
@@ -169,7 +160,7 @@ jobs:
169160
- name: Upload C ${{ matrix.cart }} cart artifact
170161
uses: actions/upload-artifact@v4
171162
with:
172-
name: ${{ matrix.cart }}_c
163+
name: cart_c_${{ matrix.cart }}
173164
path: ${{ matrix.cart }}_c.null0
174165

175166
cart_js:
@@ -188,7 +179,7 @@ jobs:
188179
- name: Upload JS ${{ matrix.cart }} cart artifact
189180
uses: actions/upload-artifact@v4
190181
with:
191-
name: ${{ matrix.cart }}_js
182+
name: cart_quickjs_${{ matrix.cart }}
192183
path: ${{ matrix.cart }}_js.null0
193184

194185
cart_as:
@@ -206,7 +197,7 @@ jobs:
206197
- name: Upload Assemblyscript ${{ matrix.cart }} cart artifact
207198
uses: actions/upload-artifact@v4
208199
with:
209-
name: ${{ matrix.cart }}_as
200+
name: cart_as_${{ matrix.cart }}
210201
path: ${{ matrix.cart }}_as.null0
211202

212203
cart_nelua:
@@ -225,7 +216,7 @@ jobs:
225216
- name: Upload Nelua ${{ matrix.cart }} cart artifact
226217
uses: actions/upload-artifact@v4
227218
with:
228-
name: ${{ matrix.cart }}_nelua
219+
name: cart_nelua_${{ matrix.cart }}
229220
path: ${{ matrix.cart }}_nelua.null0
230221

231222
# cart_nim:

0 commit comments

Comments
 (0)