Skip to content

Commit

Permalink
Merge branch 'main' into renovate/rust-toolchain
Browse files Browse the repository at this point in the history
  • Loading branch information
Boshen authored Nov 24, 2024
2 parents 6944468 + 8797849 commit bcd5245
Show file tree
Hide file tree
Showing 1,008 changed files with 15,341 additions and 14,733 deletions.
8 changes: 8 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -1,2 +1,10 @@
# https://EditorConfig.org
root = true

[*]
charset = utf-8
trim_trailing_whitespace = true
end_of_line = lf
insert_final_newline = true
indent_style = space
indent_size = 4
17 changes: 17 additions & 0 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
# Default to project owner @Boshen

@Boshen

# Ignore lock files

Cargo.lock
pnpm-lock.yaml

# Crates

/crates/oxc_transformer @overlookmotel @dunqing
/crates/oxc_semantic @Boshen @dunqing
/crates/oxc_data_structures @overlookmotel
/crates/oxc_traverse @overlookmotel
/crates/oxc_isolated_declarations @dunqing
/tasks/ast_tools
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ jobs:
RUSTFLAGS: "--cfg tokio_unstable -C target-feature=+atomics,+bulk-memory,+mutable-globals,+simd128 -C link-args=--max-memory=67108864"
CARGO_TARGET_WASM32_WASIP1_THREADS_RUNNER: "wasmtime run -W bulk-memory=y -W threads=y -S threads=y --dir=${{ github.workspace }}::${{ github.workspace }} --"
# Insta is not able to run on wasmtime, omit the packages that depend on it
TEST_FLAGS: "-p oxc_sourcemap -p oxc_ast -p oxc_cfg -p oxc_index -p oxc_regular_expression -p oxc_module_lexer -- --nocapture"
TEST_FLAGS: "-p oxc_ast -p oxc_cfg -p oxc_index -p oxc_regular_expression -p oxc_module_lexer -- --nocapture"
steps:
- uses: taiki-e/checkout-action@v1
- uses: Boshen/setup-rust@main
Expand Down
69 changes: 69 additions & 0 deletions .github/workflows/ci_vscode.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
name: CI VSCode

on:
workflow_dispatch:
pull_request:
types: [opened, synchronize]
paths:
- "pnpm-lock.yaml"
- "crates/oxc_language_server/**"
- "editors/vscode/**"
- ".github/worfkflows/ci_vscode.yml"
push:
branches:
- main
- "renovate/**"
paths:
- "pnpm-lock.yaml"
- "crates/oxc_language_server/**"
- "editors/vscode/**"
- ".github/worfkflows/ci_vscode.yml"

concurrency:
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.sha }}
cancel-in-progress: ${{ github.ref_name != 'main' }}

jobs:
compile:
name: Compile
runs-on: ubuntu-latest
steps:
- uses: taiki-e/checkout-action@v1
- uses: ./.github/actions/pnpm

- name: Compile VSCode
working-directory: editors/vscode
run: pnpm run compile

lint:
name: Lint
runs-on: ubuntu-latest
steps:
- uses: taiki-e/checkout-action@v1
- uses: ./.github/actions/pnpm

- name: Lint VSCode
working-directory: editors/vscode
run: pnpm run lint

type-check:
name: Type-Check
runs-on: ubuntu-latest
steps:
- uses: taiki-e/checkout-action@v1
- uses: ./.github/actions/pnpm

- name: Type-Check VSCode
working-directory: editors/vscode
run: pnpm run type-check

test:
name: Test
runs-on: ubuntu-latest
steps:
- uses: taiki-e/checkout-action@v1
- uses: ./.github/actions/pnpm

- name: Test VSCode
working-directory: editors/vscode
run: xvfb-run -a pnpm run test
2 changes: 1 addition & 1 deletion .github/workflows/codecov.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ jobs:

- name: Upload to codecov.io
if: env.CODECOV_TOKEN
uses: codecov/codecov-action@v4
uses: codecov/codecov-action@v5
with:
token: ${{ secrets.CODECOV_TOKEN }}
fail_ci_if_error: true
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ target/
/tasks/compat_data/node_modules/

# vscode
/editors/vscode/.vscode-test/
/editors/vscode/node_modules/
/editors/vscode/icon.png
/editors/vscode/out/
Expand Down
7 changes: 7 additions & 0 deletions .vscode/extensions.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"recommendations": [
"rust-lang.rust-analyzer", // official rust extension
"vadimcn.vscode-lldb", // for debugging
"tamasfe.even-better-toml" // toml syntax
]
}
54 changes: 28 additions & 26 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit bcd5245

Please sign in to comment.