Compare commits

...

6 Commits

5 changed files with 16 additions and 13 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

@@ -4,7 +4,7 @@ on: ["push", "pull_request"]
env: env:
CARGO_TERM_COLOR: always CARGO_TERM_COLOR: always
RUST_TOOLCHAIN: 1.86.0 RUST_TOOLCHAIN: 1.88.0
jobs: jobs:
audit: audit:

View File

@@ -5,9 +5,6 @@ on: ["push", "pull_request"]
permissions: permissions:
contents: write contents: write
env:
RUST_TOOLCHAIN: 1.86.0
jobs: jobs:
build: build:
name: Build (${{ matrix.target }}) name: Build (${{ matrix.target }})
@@ -18,15 +15,19 @@ jobs:
- os: ubuntu-latest - os: ubuntu-latest
target: x86_64-unknown-linux-gnu target: x86_64-unknown-linux-gnu
artifact_name: pacman artifact_name: pacman
toolchain: 1.88.0
- os: macos-13 - os: macos-13
target: x86_64-apple-darwin target: x86_64-apple-darwin
artifact_name: pacman artifact_name: pacman
toolchain: 1.88.0
- os: macos-latest - os: macos-latest
target: aarch64-apple-darwin target: aarch64-apple-darwin
artifact_name: pacman artifact_name: pacman
toolchain: 1.88.0
- os: windows-latest - os: windows-latest
target: x86_64-pc-windows-gnu target: x86_64-pc-windows-gnu
artifact_name: pacman.exe artifact_name: pacman.exe
toolchain: 1.88.0
runs-on: ${{ matrix.os }} runs-on: ${{ matrix.os }}
steps: steps:
- name: Checkout - name: Checkout
@@ -36,7 +37,7 @@ jobs:
uses: dtolnay/rust-toolchain@master uses: dtolnay/rust-toolchain@master
with: with:
target: ${{ matrix.target }} target: ${{ matrix.target }}
toolchain: ${{ env.RUST_TOOLCHAIN }} toolchain: ${{ matrix.toolchain }}
- name: Rust Cache - name: Rust Cache
uses: Swatinem/rust-cache@v2 uses: Swatinem/rust-cache@v2
@@ -92,13 +93,13 @@ 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
with: with:
target: wasm32-unknown-emscripten target: wasm32-unknown-emscripten
toolchain: ${{ env.RUST_TOOLCHAIN }} toolchain: 1.86.0 # we are unfortunately pinned to 1.86.0 for some reason, bulk-memory-opt related issues
- name: Rust Cache - name: Rust Cache
uses: Swatinem/rust-cache@v2 uses: Swatinem/rust-cache@v2

View File

@@ -43,16 +43,17 @@ jobs:
- name: Install cargo-tarpaulin - name: Install cargo-tarpaulin
run: cargo install cargo-tarpaulin run: cargo install cargo-tarpaulin
# Note: We manually link zlib. This should be synchronized with the flags set for Linux in .cargo/config.toml.
- name: Generate coverage report - name: Generate coverage report
run: | run: |
cargo tarpaulin \ cargo tarpaulin \
--out Html \ --out Lcov \
--output-dir coverage \ --output-dir coverage \
# Manually link zlib. This should be synchronized with the flags set for Linux in .cargo/config.toml.
--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

@@ -4,7 +4,7 @@ on: ["push", "pull_request"]
env: env:
CARGO_TERM_COLOR: always CARGO_TERM_COLOR: always
RUST_TOOLCHAIN: 1.86.0 RUST_TOOLCHAIN: 1.88.0
jobs: jobs:
test: test:
@@ -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