Skip to content

Commit

Permalink
Update livesplit-core and build for x86-64-v3 (#22)
Browse files Browse the repository at this point in the history
This updates `livesplit-core` and in particular its dependency on
`wasmtime` as apparently older versions of `wasmtime` panic when
generating DWARF debug symbols on some WASM files.

Additionally this adds builds for `x86-64-v3`, making use of modern SSE
and AVX instructions to improve rendering speed by a lot.
  • Loading branch information
CryZe authored Mar 19, 2023
1 parent 4c1b4b2 commit d12f74f
Show file tree
Hide file tree
Showing 3 changed files with 166 additions and 102 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/before_deploy.sh
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ main() {

cd $stage
if [ "$OS_NAME" = "windows-latest" ]; then
7z a $src/obs-livesplit-one-$tag-$TARGET.zip *
7z a $src/obs-livesplit-one-$tag-$RELEASE_TARGET.zip *
else
tar czf $src/obs-livesplit-one-$tag-$TARGET.tar.gz *
tar czf $src/obs-livesplit-one-$tag-$RELEASE_TARGET.tar.gz *
fi
cd $src

Expand Down
48 changes: 44 additions & 4 deletions .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,16 @@ jobs:
- Windows aarch64
- Windows i686
- Windows x86_64
- Windows x86_64-v3
- Linux arm Hardware Float
- Linux armv7 Hardware Float
- Linux aarch64
- Linux i686
- Linux x86_64
- Linux x86_64-v3
- macOS aarch64
- macOS x86_64
- macOS x86_64-v3

include:
- label: Windows aarch64
Expand All @@ -51,6 +54,14 @@ jobs:
features: font-loading,auto-splitting
cross: skip

- label: Windows x86_64-v3
target: x86_64-pc-windows-msvc
target_rename: x86_64_v3-pc-windows-msvc
rust_flags: -C target-cpu=x86-64-v3
os: windows-latest
features: font-loading,auto-splitting
cross: skip

- label: Linux arm Hardware Float
target: arm-unknown-linux-gnueabihf
os: ubuntu-latest
Expand Down Expand Up @@ -80,6 +91,14 @@ jobs:
features: font-loading,auto-splitting
cross: skip

- label: Linux x86_64-v3
target: x86_64-unknown-linux-gnu
target_rename: x86_64_v3-unknown-linux-gnu
rust_flags: -C target-cpu=x86-64-v3
os: ubuntu-latest
features: font-loading,auto-splitting
cross: skip

- label: macOS aarch64
target: aarch64-apple-darwin
os: macOS-latest
Expand All @@ -93,9 +112,17 @@ jobs:
features: font-loading,auto-splitting
cross: skip

- label: macOS x86_64-v3
target: x86_64-apple-darwin
target_rename: x86_64_v3-apple-darwin
rust_flags: -C target-cpu=x86-64-v3
os: macOS-latest
features: font-loading,auto-splitting
cross: skip

steps:
- name: Checkout Commit
uses: actions/checkout@v2
uses: actions/checkout@v3

- name: Install Rust
uses: hecrj/setup-rust-action@v1
Expand All @@ -106,9 +133,20 @@ jobs:
if: matrix.install_target != ''
run: rustup target add ${{ matrix.target }}

- name: Download cross
if: matrix.cross == ''
uses: robinraju/[email protected]
with:
repository: "cross-rs/cross"
latest: true
fileName: "cross-x86_64-unknown-linux-gnu.tar.gz"
out-file-path: "/home/runner/.cargo/bin"

- name: Install cross
if: matrix.cross == ''
run: cargo install cross
run: |
cd ~/.cargo/bin
tar -xzf cross-x86_64-unknown-linux-gnu.tar.gz
- name: Cache
uses: Swatinem/rust-cache@ce325b60658c1b38465c06cc965b79baf32c1e72
Expand All @@ -124,6 +162,7 @@ jobs:
IS_DEPLOY: ${{ startsWith(github.ref, 'refs/tags/') && (matrix.release_anyway != '' || !(startsWith(matrix.toolchain, 'nightly') || startsWith(matrix.toolchain, 'beta'))) }}
FEATURES: ${{ matrix.features }}
OS_NAME: ${{ matrix.os }}
RUSTFLAGS: ${{ matrix.rust_flags }}

- name: Prepare Release
if: startsWith(github.ref, 'refs/tags/') && matrix.release == ''
Expand All @@ -132,6 +171,7 @@ jobs:
env:
OS_NAME: ${{ matrix.os }}
TARGET: ${{ matrix.target }}
RELEASE_TARGET: ${{ matrix.target_rename || matrix.target }}
PLUGIN_BITS: ${{ matrix.bits || '64bit' }}

- name: Release
Expand All @@ -146,7 +186,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout Commit
uses: actions/checkout@v2
uses: actions/checkout@v3

- name: Install Rust
uses: hecrj/setup-rust-action@v1
Expand All @@ -160,7 +200,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout Commit
uses: actions/checkout@v2
uses: actions/checkout@v3

- name: Install Rust
uses: hecrj/setup-rust-action@v1
Expand Down
Loading

0 comments on commit d12f74f

Please sign in to comment.