Compare commits

...

3 Commits

4 changed files with 7 additions and 5 deletions

View File

@@ -5,6 +5,7 @@ rustflags = [
"-C", "link-args=-sUSE_SDL=2 -sUSE_SDL_IMAGE=2 -sUSE_SDL_MIXER=2 -sUSE_OGG=1 -sUSE_SDL_GFX=2 -sUSE_SDL_TTF=2 -sSDL2_IMAGE_FORMATS=['png']", "-C", "link-args=-sUSE_SDL=2 -sUSE_SDL_IMAGE=2 -sUSE_SDL_MIXER=2 -sUSE_OGG=1 -sUSE_SDL_GFX=2 -sUSE_SDL_TTF=2 -sSDL2_IMAGE_FORMATS=['png']",
"-C", "link-args=--preload-file assets/game/", "-C", "link-args=--preload-file assets/game/",
] ]
runner = "node"
[target.'cfg(target_os = "linux")'] [target.'cfg(target_os = "linux")']
rustflags = [ rustflags = [
@@ -13,4 +14,4 @@ rustflags = [
# By adding `-lz` here, we ensure it's passed to the linker after `libpng`, # By adding `-lz` here, we ensure it's passed to the linker after `libpng`,
# which is required for the linker to correctly resolve symbols. # which is required for the linker to correctly resolve symbols.
"-C", "link-arg=-lz", "-C", "link-arg=-lz",
] ]

View File

@@ -90,7 +90,7 @@ jobs:
uses: pyodide/setup-emsdk@v15 uses: pyodide/setup-emsdk@v15
with: with:
version: 3.1.43 version: 3.1.43
actions-cache-folder: "emsdk-cache" actions-cache-folder: "emsdk-cache-b"
- name: Setup Rust (WASM32 Emscripten) - name: Setup Rust (WASM32 Emscripten)
uses: dtolnay/rust-toolchain@master uses: dtolnay/rust-toolchain@master

View File

@@ -47,12 +47,13 @@ jobs:
- name: Generate coverage report - name: Generate coverage report
run: | run: |
cargo tarpaulin \ cargo tarpaulin \
--out Html \ --out Lcov \
--output-dir coverage \ --output-dir coverage \
--rustflags="-C link-arg=-lz" --rustflags="-C link-arg=-lz"
- name: Upload coverage to Coveralls - name: Upload coverage to Coveralls
uses: coverallsapp/github-action@v2 uses: coverallsapp/github-action@v2
with: with:
files: ./coverage/tarpaulin-report.html files: ./coverage/lcov.info
format: lcov
allow-empty: false allow-empty: false

View File

@@ -19,7 +19,7 @@ jobs:
uses: dtolnay/rust-toolchain@master uses: dtolnay/rust-toolchain@master
with: with:
toolchain: ${{ env.RUST_TOOLCHAIN }} toolchain: ${{ env.RUST_TOOLCHAIN }}
components: clippy components: clippy, rustfmt
- name: Rust Cache - name: Rust Cache
uses: Swatinem/rust-cache@v2 uses: Swatinem/rust-cache@v2