Skip to content

Commit

Permalink
Merge branch 'master' into leaderboard-splits
Browse files Browse the repository at this point in the history
  • Loading branch information
wooferzfg committed Jun 19, 2024
2 parents e691ba8 + e897dd8 commit 96f370d
Show file tree
Hide file tree
Showing 48 changed files with 3,932 additions and 2,461 deletions.
11 changes: 7 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,12 @@ jobs:
uses: actions/checkout@v4
with:
submodules: recursive
# This forces the entire history to be cloned, which is necessary for
# the changelog generation to work correctly.
fetch-depth: 0

- name: Install Node
uses: actions/setup-node@v2.3.0
uses: actions/setup-node@v4
with:
node-version: 'lts/*'

Expand All @@ -30,7 +33,7 @@ jobs:

- name: Download binaryen
if: github.repository == 'LiveSplit/LiveSplitOne' && github.ref == 'refs/heads/master'
uses: robinraju/release-downloader@v1.7
uses: robinraju/release-downloader@v1.10
with:
repository: "WebAssembly/binaryen"
latest: true
Expand Down Expand Up @@ -63,7 +66,7 @@ jobs:
mv wasm-bindgen-${{ steps.wasm-bindgen.outputs.version }}-x86_64-unknown-linux-musl/wasm* .
- name: Install npm packages
run: npm ci
run: npm ci -f
env:
DETECT_CHROMEDRIVER_VERSION: true

Expand Down Expand Up @@ -107,7 +110,7 @@ jobs:

- name: Deploy
if: github.repository == 'LiveSplit/LiveSplitOne' && github.ref == 'refs/heads/master'
uses: peaceiris/actions-gh-pages@v3
uses: peaceiris/actions-gh-pages@v4
with:
deploy_key: ${{ secrets.ACTIONS_DEPLOY_KEY }}
publish_branch: gh-pages
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ cargo install wasm-bindgen-cli
You need to set up some npm modules before compiling the project:

```bash
npm install
npm install -f
```

You are now ready to build livesplit-core, which powers LiveSplit One:
Expand Down
4 changes: 1 addition & 3 deletions buildCore.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,7 @@ if (process.argv.some((v) => v === "--unstable")) {
if (process.argv.some((v) => v === "--nightly")) {
toolchain = "+nightly";
cargoFlags += " -Z build-std=std,panic_abort -Z build-std-features=panic_immediate_abort";
// Multivalue is not supported by wasm-bindgen yet:
// https://github.com/rustwasm/wasm-bindgen/issues/3552
// rustFlags += ",+multivalue";
rustFlags += ",+multivalue -Z wasm-c-abi=spec";

// Virtual function elimination requires LTO, so we can only do it for
// max-opt builds.
Expand Down
Loading

0 comments on commit 96f370d

Please sign in to comment.