Skip to content

Commit 8461b35

Browse files
committed
Fix WASM CI build
1 parent 95868f1 commit 8461b35

File tree

2 files changed

+7
-10
lines changed

2 files changed

+7
-10
lines changed

.github/workflows/build.yaml

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ on:
1010

1111
env:
1212
BUILD_PROFILE: release-lto
13-
CARGO_TARGET_DIR: target
1413
CARGO_INCREMENTAL: 0
1514

1615
jobs:
@@ -167,8 +166,8 @@ jobs:
167166
with:
168167
name: ${{ env.CARGO_BIN_NAME }}-${{ matrix.name }}
169168
path: |
170-
${{ env.CARGO_TARGET_DIR }}/${{ matrix.target }}/${{ env.BUILD_PROFILE }}/${{ env.CARGO_BIN_NAME }}
171-
${{ env.CARGO_TARGET_DIR }}/${{ matrix.target }}/${{ env.BUILD_PROFILE }}/${{ env.CARGO_BIN_NAME }}.exe
169+
target/${{ matrix.target }}/${{ env.BUILD_PROFILE }}/${{ env.CARGO_BIN_NAME }}
170+
target/${{ matrix.target }}/${{ env.BUILD_PROFILE }}/${{ env.CARGO_BIN_NAME }}.exe
172171
if-no-files-found: error
173172

174173
build-gui:
@@ -222,8 +221,8 @@ jobs:
222221
with:
223222
name: ${{ env.CARGO_BIN_NAME }}-${{ matrix.name }}
224223
path: |
225-
${{ env.CARGO_TARGET_DIR }}/${{ matrix.target }}/${{ env.BUILD_PROFILE }}/${{ env.CARGO_BIN_NAME }}
226-
${{ env.CARGO_TARGET_DIR }}/${{ matrix.target }}/${{ env.BUILD_PROFILE }}/${{ env.CARGO_BIN_NAME }}.exe
224+
target/${{ matrix.target }}/${{ env.BUILD_PROFILE }}/${{ env.CARGO_BIN_NAME }}
225+
target/${{ matrix.target }}/${{ env.BUILD_PROFILE }}/${{ env.CARGO_BIN_NAME }}.exe
227226
if-no-files-found: error
228227

229228
build-wasm:
@@ -239,11 +238,9 @@ jobs:
239238
- name: Cache Rust workspace
240239
uses: Swatinem/rust-cache@v2
241240
- name: Install dependencies
242-
working-directory: objdiff-wasm
243-
run: npm install
241+
run: npm -C objdiff-wasm install
244242
- name: Build
245-
working-directory: objdiff-wasm
246-
run: npm run build
243+
run: npm -C objdiff-wasm run build
247244

248245
release:
249246
name: Release

objdiff-wasm/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ regex = { version = "1.11", default-features = false }
2727
[dependencies.objdiff-core]
2828
path = "../objdiff-core"
2929
default-features = false
30-
features = ["arm", "arm64", "mips", "ppc", "dwarf"]
30+
features = ["arm", "arm64", "mips", "ppc", "x86", "dwarf"]
3131

3232
[target.'cfg(target_family = "wasm")'.dependencies]
3333
talc = { version = "4.4", default-features = false, features = ["lock_api"] }

0 commit comments

Comments
 (0)