Skip to content

Commit ad65e6d

Browse files
committed
ci: apply suggestions
1 parent 29f694b commit ad65e6d

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

.github/workflows/release-napi.yml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,11 @@ on:
1010
pull_request: null
1111

1212
env:
13-
DEBUG: "napi:*"
13+
DEBUG: napi:*
14+
APP_NAME: rspack-resolver
15+
OXC_LOG: 'debug'
16+
MACOSX_DEPLOYMENT_TARGET: '10.13'
17+
CC: clang
1418

1519
concurrency:
1620
group: ${{ github.workflow }}-${{ github.ref }}
@@ -84,6 +88,7 @@ jobs:
8488
setup: |
8589
sudo apt-get update
8690
sudo apt-get install gcc-riscv64-linux-gnu -y
91+
export CFLAGS="-fuse-ld=lld"
8792
echo "CXX=riscv64-linux-gnu-gcc" >> $GITHUB_ENV
8893
build: pnpm build --use-napi-cross
8994
- os: ubuntu-latest
@@ -94,6 +99,7 @@ jobs:
9499
setup: |
95100
sudo apt-get update
96101
sudo apt-get install gcc-s390x-linux-gnu -y
102+
export CFLAGS="-fuse-ld=lld"
97103
echo "CXX=s390x-linux-gnu-gcc" >> $GITHUB_ENV
98104
build: pnpm build
99105
- os: macos-latest
@@ -138,8 +144,6 @@ jobs:
138144
- name: Build
139145
run: ${{ matrix.build }} --target ${{ matrix.target }}
140146
shell: bash
141-
env:
142-
CC: ${{ matrix.target != 'riscv64gc-unknown-linux-gnu' && matrix.target != 's390x-unknown-linux-gnu' && 'clang' || '' }}
143147

144148
- name: Upload artifacts
145149
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4

napi/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ tracing-subscriber = { version = "0.3.18", default-features = false, features =
1919
[target.'cfg(all(not(target_os = "linux"), not(target_os = "freebsd"), not(target_arch = "arm"), not(target_family = "wasm")))'.dependencies]
2020
mimalloc-safe = { version = "0.1.49", features = ["skip_collect_on_exit"] }
2121

22-
[target.'cfg(any(all(target_os = "linux", not(target_arch = "arm")), target_os = "freebsd"))'.dependencies]
22+
[target.'cfg(all(target_os = "linux", not(target_arch = "arm")))'.dependencies]
2323
mimalloc-safe = { version = "0.1.49", features = ["skip_collect_on_exit", "local_dynamic_tls"] }
2424

2525
[build-dependencies]

0 commit comments

Comments
 (0)