Skip to content

Commit

Permalink
Merge branch 'main' into fix/skyline-components
Browse files Browse the repository at this point in the history
  • Loading branch information
koppthe authored Apr 17, 2024
2 parents 73ed98d + 134812f commit eb62dd8
Show file tree
Hide file tree
Showing 1,164 changed files with 62,995 additions and 19,599 deletions.
8 changes: 5 additions & 3 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,14 @@ module.exports = {
'import',
'jest',
'react',
'simple-import-sort',
'prettier'
'simple-import-sort'
],
extends: [
'eslint:recommended',
'standard',
'plugin:@typescript-eslint/recommended',
'plugin:react/jsx-runtime',
'plugin:react/recommended',
'prettier'
],
rules: {
'@typescript-eslint/ban-ts-comment': 0,
Expand All @@ -31,6 +29,10 @@ module.exports = {
'@typescript-eslint/no-use-before-define': [1, { functions: false, classes: false }],
'@typescript-eslint/no-var-requires': 0,
camelcase: 0,
'eol-last': 0,
'comma-dangle': 0,
'no-mixed-operators': 1,
'no-multiple-empty-lines': 0,
'import/first': 2,
'import/newline-after-import': 2,
'import/no-duplicates': 2,
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/build-rust-binding.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,10 @@ jobs:
set -e &&
pnpm build:binding:release --target x86_64-unknown-linux-gnu &&
strip crates/native_binding/*.node
- host: ubuntu-20.04
target: x86_64-unknown-linux-musl
docker: ghcr.io/napi-rs/napi-rs/nodejs-rust:lts-alpine
build: set -e && pnpm build:binding:release && strip crates/native_binding/*.node
- host: macos-11
target: aarch64-apple-darwin
build: |
Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/nodejs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@ jobs:
target: x86_64-pc-windows-msvc
- host: ubuntu-latest
target: x86_64-unknown-linux-gnu
- host: ubuntu-latest
target: x86_64-unknown-linux-musl
runs-on: ${{ matrix.settings.host }}
steps:
- name: Checkout
Expand Down Expand Up @@ -72,9 +74,9 @@ jobs:
path: crates/native_binding
- name: Test bindings
run: pnpm test:binding
if: ${{ matrix.settings.target != 'x86_64-unknown-linux-gnu' }}
if: ${{ matrix.settings.target != 'x86_64-unknown-linux-gnu' && matrix.settings.target != 'x86_64-unknown-linux-musl'}}
- name: Test bindings with docker
if: ${{ matrix.settings.target == 'x86_64-unknown-linux-gnu' }}
if: ${{ matrix.settings.target == 'x86_64-unknown-linux-gnu' || matrix.settings.target == 'x86_64-unknown-linux-musl'}}
# 暂时使用了一个第三方的 docker 镜像
run: docker run --rm -v $(pwd):/build -w /build chf007/pnpm pnpm test:binding
# 以下的测试流程应该在所有平台都执行,但 windows 好像还有些问题,因此目前只在 ubuntu-latest 执行
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ on:
branches:
- 'chore/**'
- 'feat/**'
- 'fix/**'
# When Release Pull Request is merged
pull_request:
branches:
Expand Down
12 changes: 0 additions & 12 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,16 +1,4 @@
{
"eslint.validate": [
"javascript",
"javascriptreact",
{
"language": "typescript",
"autoFix": true
},
{
"language": "typescriptreact",
"autoFix": true
}
],
"search.exclude": {
"**/.git": true,
"**/node_modules": true,
Expand Down
Loading

0 comments on commit eb62dd8

Please sign in to comment.