Skip to content

Commit 5aa6126

Browse files
committed
fixup! fixup! Add Emscripten builds
1 parent 4447cee commit 5aa6126

File tree

2 files changed

+8
-5
lines changed

2 files changed

+8
-5
lines changed

.github/workflows/cmake.yml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,9 @@ jobs:
145145

146146
emscripten:
147147
runs-on: ubuntu-24.04
148+
strategy:
149+
matrix:
150+
build_type: [Debug, Release]
148151
env:
149152
EM_VERSION: 4.0.5
150153
EM_CACHE_FOLDER: "emsdk-cache"
@@ -180,20 +183,20 @@ jobs:
180183
-DVCPKG_CHAINLOAD_TOOLCHAIN_FILE="${EMSDK}/upstream/emscripten/cmake/Modules/Platform/Emscripten.cmake"
181184
-DCMAKE_TOOLCHAIN_FILE=vcpkg/scripts/buildsystems/vcpkg.cmake
182185
-DVCPKG_TARGET_TRIPLET=wasm32-emscripten
183-
-DCMAKE_BUILD_TYPE="${{ env.BUILD_TYPE }}"
186+
-DCMAKE_BUILD_TYPE="${{ matrix.build_type }}"
184187
- name: Build
185188
run: cmake --build build
186189
- name: Show contents of the build directory
187190
run: find build
188191
- uses: actions/upload-artifact@v4
189192
with:
190-
name: emscripten-builds
193+
name: emscripten-${{ matrix.build_type }}
191194
path: build/bin
192195
retention-days: 7
193196
if-no-files-found: error
194197
compression-level: 6
195198
- name: Install Butler
196-
if: github.ref == 'refs/heads/main'
199+
if: github.ref == 'refs/heads/main' && matrix.build_type == 'Release'
197200
run: |
198201
mkdir ~/bin
199202
cd ~/bin
@@ -203,7 +206,7 @@ jobs:
203206
echo "~/bin" >> $GITHUB_PATH
204207
~/bin/butler -V
205208
- name: Upload to Itch
206-
if: github.ref == 'refs/heads/main'
209+
if: github.ref == 'refs/heads/main' && matrix.build_type == 'Release'
207210
env:
208211
BUTLER_API_KEY: ${{ secrets.BUTLER_API_KEY }}
209212
run: butler push dist/${{ env.archive-name }} hexdecimal/${{ env.project-name }}:emscripten-latest

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ if (EMSCRIPTEN)
3737
# Attach data folder to Emscripten builds.
3838
target_link_options(${PROJECT_NAME} PRIVATE
3939
"SHELL:--preload-file ${CMAKE_CURRENT_SOURCE_DIR}/data@data"
40-
"SHELL:-lidbfs.js" # Enable IDBFS (browser file system.)
40+
-lidbfs.js # Enable IDBFS (browser file system.)
4141
)
4242
configure_file(
4343
${PROJECT_SOURCE_DIR}/emscripten/index.html

0 commit comments

Comments
 (0)