Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(node): improve node/binding structure #550

Merged
merged 10 commits into from Mar 11, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/ci.yaml
Expand Up @@ -104,8 +104,8 @@ jobs:
- name: Install dependencies
run: yarn install

- name: Build
run: yarn build:node
- name: Build Rolldown
run: yarn build

- name: Type Check
run: yarn type-check
Expand Down
32 changes: 16 additions & 16 deletions .github/workflows/release.yml
Expand Up @@ -15,7 +15,7 @@ jobs:
include:
- os: macos-latest
target: x86_64-apple-darwin
build: yarn build:binding:release
build: yarn build-binding:release

- os: macos-latest
target: aarch64-apple-darwin
Expand All @@ -26,36 +26,36 @@ jobs:
SYSROOT=$(xcrun --sdk macosx --show-sdk-path);
export CFLAGS="-isysroot $SYSROOT -isystem $SYSROOT";
export CARGO_BUILD_TARGET=aarch64-apple-darwin
yarn build:binding:release
yarn build-binding:release

- os: windows-latest
target: x86_64-pc-windows-msvc
build: yarn build:binding:release
build: yarn build-binding:release

- os: windows-latest
target: i686-pc-windows-msvc
build: |
export CARGO_BUILD_TARGET=i686-pc-windows-msvc
yarn build:binding:release
yarn build-binding:release

- os: windows-latest
target: aarch64-pc-windows-msvc
build: |
export CARGO_BUILD_TARGET=aarch64-pc-windows-msvc
yarn build:binding:release
yarn build-binding:release

- os: ubuntu-latest
target: x86_64-unknown-linux-gnu
docker: ghcr.io/napi-rs/napi-rs/nodejs-rust:lts-debian
build: |-
set -e &&
export CARGO_BUILD_TARGET=x86_64-unknown-linux-gnu &&
yarn build:binding:release
yarn build-binding:release

- os: ubuntu-latest
target: x86_64-unknown-linux-musl
docker: ghcr.io/napi-rs/napi-rs/nodejs-rust:lts-alpine
build: yarn build:binding:release
build: yarn build-binding:release

- os: ubuntu-latest
target: aarch64-unknown-linux-gnu
Expand All @@ -64,27 +64,27 @@ jobs:
set -e &&
export CARGO_BUILD_TARGET=aarch64-unknown-linux-gnu &&
rustup target add aarch64-unknown-linux-gnu &&
yarn build:binding:release
yarn build-binding:release

- os: ubuntu-latest
target: armv7-unknown-linux-gnueabihf
build: |
sudo apt-get update
sudo apt-get install gcc-arm-linux-gnueabihf -y
export CARGO_BUILD_TARGET=armv7-unknown-linux-gnueabihf
yarn build:binding:release --zig --zig-link-only
yarn build-binding:release --zig --zig-link-only

- os: ubuntu-latest
target: aarch64-linux-android
build: |
export CARGO_BUILD_TARGET=aarch64-linux-android
yarn build:binding:release
yarn build-binding:release

- os: ubuntu-latest
target: armv7-linux-androideabi
build: |
export CARGO_BUILD_TARGET=armv7-linux-androideabi
yarn build:binding:release
yarn build-binding:release

- os: ubuntu-latest
target: aarch64-unknown-linux-musl
Expand All @@ -94,7 +94,7 @@ jobs:
rustup target add aarch64-unknown-linux-musl &&
export CARGO_BUILD_TARGET=aarch64-unknown-linux-musl &&
export CARGO_TARGET_AARCH64_UNKNOWN_LINUX_MUSL_LINKER=aarch64-linux-musl-gcc &&
yarn build:binding:release
yarn build-binding:release
name: Build ${{ matrix.target }}
runs-on: ${{ matrix.os }}
steps:
Expand Down Expand Up @@ -168,7 +168,7 @@ jobs:
with:
if-no-files-found: error
name: node-artifact
path: packages/node/dist/**
path: packages/rolldown/dist/**

build-wasm:
name: Build Wasm
Expand All @@ -191,7 +191,7 @@ jobs:
run: yarn install

- name: Build Wasm
run: yarn build:wasm:release
run: yarn build-wasm:release

- name: Upload Wasm Artifact
uses: actions/upload-artifact@v4
Expand Down Expand Up @@ -248,7 +248,7 @@ jobs:
- name: Download Node Artifacts
uses: actions/download-artifact@v4
with:
path: packages/node/dist
path: packages/rolldown/dist
name: node-artifact

- name: Node Test
Expand Down Expand Up @@ -295,7 +295,7 @@ jobs:
- name: Download Node Artifacts
uses: actions/download-artifact@v4
with:
path: packages/node/dist
path: packages/rolldown/dist
name: node-artifact

- name: Publish
Expand Down
4 changes: 2 additions & 2 deletions .ls-lint.yml
Expand Up @@ -11,8 +11,8 @@ ignore:
- '**/dist'
- packages/rollup-tests/test # Copied from rollup repo
- 'crates/rolldown/tests/fixtures/**/_test.js' # `_test.js` is a special file, which will be treat as the entry file while executing the build output of fixture.
- packages/node/build.config.ts # convention name for using unbuild
- packages/node/vitest.config.ts
- packages/rolldown/build.config.ts # convention name for using unbuild
- packages/rolldown/vitest.config.ts
- web/docs/.vitepress/cache # cache files generated by vitepress
# FIXME: should not ignore following folders
- web
4 changes: 2 additions & 2 deletions .oxlintignore
@@ -1,4 +1,4 @@
crates/**
packages/rollup-tests/**
packages/node/test/cases/**
rollup/**
packages/rolldown/test/cases/**
rollup/**
1 change: 0 additions & 1 deletion crates/rolldown_binding/.gitignore

This file was deleted.