Skip to content

Commit b00113b

Browse files
adam-ceadam-ce
authored
Merge pull request #255 from adam-ce/main
Refactor WebAssembly deployment and fix build warnings
2 parents dce9511 + c4afc7d commit b00113b

37 files changed

Lines changed: 1322 additions & 584 deletions

‎.github/workflows/cmake-presets.yml‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ permissions:
1515

1616
jobs:
1717
msvc-debug:
18-
runs-on: windows-latest
18+
runs-on: windows-2022
1919
defaults:
2020
run:
2121
shell: powershell
@@ -53,7 +53,10 @@ jobs:
5353
sccache-${{ runner.os }}-${{ env.ALP_CACHE_CONFIG }}-${{ env.ALP_CACHE_TOOLCHAIN }}-v1-
5454
5555
- name: Make sure MSVC is found when Ninja generator is in use
56-
uses: ilammy/msvc-dev-cmd@v1
56+
uses: TheMrMilchmann/setup-msvc-dev@v4
57+
with:
58+
arch: x64
59+
sdk: 10.0.26100.0
5760

5861
- name: Install tools
5962
run: choco install 7zip.install ninja
@@ -85,6 +88,7 @@ jobs:
8588
- name: Configure
8689
env:
8790
CMAKE_PREFIX_PATH: ${{ env.QT_ROOT_DIR }}/lib/cmake
91+
GITHUB_TOKEN: ${{ github.token }}
8892
run: >
8993
cmake --preset ${{ matrix.preset }}
9094
-DCMAKE_POLICY_DEFAULT_CMP0141=NEW

‎.github/workflows/deploy.yml‎

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ jobs:
193193
find "$BUILD_DIR" -type f -iname "*.apk" ! -name "android-build-*.apk" -exec cp {} "$INSTALL_DIR" \;
194194
195195
- name: Create artifact
196-
uses: actions/upload-artifact@v5
196+
uses: actions/upload-artifact@v7
197197
with:
198198
name: files_${{ matrix.qtarch }}
199199
path: ${{ github.workspace }}/install/
@@ -383,14 +383,18 @@ jobs:
383383
if: always()
384384
run: ccache --show-stats --verbose
385385

386-
- name: Verify WebGPU app artifacts
386+
- name: Verify app artifacts
387387
run: |
388-
test -f "$INSTALL_DIR/webgpu_app.html"
389-
test -f "$INSTALL_DIR/webgpu_app.js"
390-
test -f "$INSTALL_DIR/webgpu_app.wasm"
388+
test -f "$INSTALL_DIR/alpineapp/alpineapp.html"
389+
test -f "$INSTALL_DIR/alpineapp/alpineapp.js"
390+
test -f "$INSTALL_DIR/alpineapp/alpineapp.wasm"
391+
test -f "$INSTALL_DIR/alpineapp/logo_vertical_light_bg.png"
392+
test -f "$INSTALL_DIR/webgpu_app/webgpu_app.html"
393+
test -f "$INSTALL_DIR/webgpu_app/webgpu_app.js"
394+
test -f "$INSTALL_DIR/webgpu_app/webgpu_app.wasm"
391395
392396
- name: Create artifact
393-
uses: actions/upload-artifact@v5
397+
uses: actions/upload-artifact@v7
394398
with:
395399
name: files_${{ matrix.config}}
396400
path: ${{ github.workspace }}/install/
@@ -451,9 +455,10 @@ jobs:
451455
run: |
452456
for config in wasm_mt wasm_mt_debug wasm_mt_lto; do
453457
cd "$GITHUB_WORKSPACE/github_page/$config"
454-
wget -q https://raw.githubusercontent.com/gzuidhof/coi-serviceworker/master/coi-serviceworker.min.js
455-
for html in alpineapp.html webgpu_app.html; do
458+
for target in alpineapp webgpu_app; do
459+
html="$target/$target.html"
456460
test -f "$html"
461+
wget -q -O "$target/coi-serviceworker.min.js" https://raw.githubusercontent.com/gzuidhof/coi-serviceworker/master/coi-serviceworker.min.js
457462
sed -i -e 's#<body onload="init()">#<body onload="init()"><script src="coi-serviceworker\.min\.js"></script>#g' "$html"
458463
done
459464
done
@@ -464,13 +469,13 @@ jobs:
464469
target: github_page
465470

466471
- name: Create Pages artifact
467-
uses: actions/upload-pages-artifact@v4
472+
uses: actions/upload-pages-artifact@v5
468473
with:
469474
path: ${{github.workspace}}/github_page
470475

471476
- name: Setup Pages
472-
uses: actions/configure-pages@v5
477+
uses: actions/configure-pages@v6
473478

474479
- name: Deploy to GitHub Pages
475480
id: deployment
476-
uses: actions/deploy-pages@v4
481+
uses: actions/deploy-pages@v5

‎.github/workflows/linux.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,7 @@ jobs:
110110
CC: ${{ matrix.CC }}
111111
CXX: ${{ matrix.CXX }}
112112
CMAKE_PREFIX_PATH: ${{env.QT_ROOT_DIR}}/lib/cmake
113+
GITHUB_TOKEN: ${{ github.token }}
113114
run: >
114115
cmake -G Ninja
115116
-DCMAKE_BUILD_TYPE=${{matrix.BUILD_TYPE}}

‎.github/workflows/play-store.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ jobs:
201201
find "$PLAY_STORE_DIR" -type f -iname "*.aab"
202202
203203
- name: Create Play Store artifact
204-
uses: actions/upload-artifact@v5
204+
uses: actions/upload-artifact@v7
205205
with:
206206
name: play_store_aab
207207
path: ${{ github.workspace }}/play-store/

0 commit comments

Comments
 (0)