Skip to content

Commit

Permalink
Merge branch 'main' into feat/no-constructor-return
Browse files Browse the repository at this point in the history
  • Loading branch information
rzvxa authored May 30, 2024
2 parents dbb0686 + 0cdb45a commit 12bdddc
Show file tree
Hide file tree
Showing 387 changed files with 38,893 additions and 2,672 deletions.
3 changes: 3 additions & 0 deletions .cargo/config.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,6 @@ coverage = "run -p oxc_coverage --release --"
benchmark = "run -p oxc_benchmark --release --"
minsize = "run -p oxc_minsize --release --"
rule = "run -p rulegen"

# Build oxlint in release mode
oxlint = "build --release --bin oxlint --features allocator"
88 changes: 0 additions & 88 deletions .github/actions/rustup/action.yml

This file was deleted.

1 change: 1 addition & 0 deletions .github/codecov.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ ignore:
- "fuzz"
- "crates/oxc_ast/src/ast_kind.rs"
- "crates/oxc_ast/src/span.rs"
- "crates/oxc_traverse/src/ancestor.rs"
- "crates/oxc_wasm" # Remove this once wasm is completed
- "crates/oxc_diagnostics"
- "crates/oxc_js_regex" # not ready
2 changes: 1 addition & 1 deletion .github/labeler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ A-ast:

A-cli:
- changed-files:
- any-glob-to-any-file: ['crates/oxc_cli/**']
- any-glob-to-any-file: ['apps/oxlint/**']

A-prettier:
- changed-files:
Expand Down
44 changes: 25 additions & 19 deletions .github/workflows/benchmark.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,10 @@ concurrency:
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.sha }}
cancel-in-progress: true

defaults:
run:
shell: bash

jobs:
# Build and run benchmarks for all components except linter
benchmark:
Expand All @@ -51,7 +55,7 @@ jobs:
- lexer
- parser
- transformer
- semantic
# - semantic # Too flaky
- minifier
- codegen_sourcemap
- sourcemap
Expand All @@ -60,16 +64,11 @@ jobs:
- name: Checkout Branch
uses: taiki-e/checkout-action@v1

- name: Install Rust Toolchain
uses: ./.github/actions/rustup
- uses: Boshen/setup-rust@main
with:
shared-key: benchmark-${{ matrix.component }}
cache-key: benchmark-${{ matrix.component }}
save-cache: ${{ github.ref_name == 'main' }}

- name: Install codspeed
uses: taiki-e/install-action@v2
with:
tool: cargo-codspeed
tools: cargo-codspeed

- name: Install Node.js
uses: actions/setup-node@v4
Expand All @@ -89,7 +88,6 @@ jobs:
- name: Build benchmark
env:
RUSTFLAGS: "-C debuginfo=1 -C strip=none -g --cfg codspeed"
shell: bash
run: |
cargo build --release -p oxc_benchmark --bench ${{ matrix.component }} \
--no-default-features --features ${{ matrix.component }} --features codspeed
Expand Down Expand Up @@ -120,20 +118,31 @@ jobs:
build-linter:
name: Build Linter Benchmark
runs-on: ubuntu-latest
env:
# https://github.com/mozilla/sccache/blob/main/docs/S3.md
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
SCCACHE_BUCKET: ${{ secrets.SCCACHE_BUCKET }}
SCCACHE_ENDPOINT: ${{ secrets.SCCACHE_ENDPOINT }}
SCCACHE_REGION: auto
RUSTC_WRAPPER: ${{ vars.USE_SCCACHE == 'true' && 'sccache' || '' }}
CARGO_INCREMENTAL: 0
SCCACHE_LOCAL_RW_MODE:
steps:
- name: Checkout Branch
uses: taiki-e/checkout-action@v1

- name: Install Rust Toolchain
uses: ./.github/actions/rustup
- uses: Boshen/setup-rust@main
with:
shared-key: benchmark-linter
cache-key: benchmark-linter
save-cache: ${{ github.ref_name == 'main' }}

- uses: mozilla-actions/sccache-action@v0.0.4
if: ${{ vars.USE_SCCACHE == 'true' }}

- name: Build benchmark
env:
RUSTFLAGS: "-C debuginfo=1 -C strip=none -g --cfg codspeed"
shell: bash
run: |
cargo build --release -p oxc_benchmark --bench linter \
--no-default-features --features linter --features codspeed
Expand Down Expand Up @@ -172,7 +181,6 @@ jobs:
path: ./target/codspeed/oxc_benchmark

- name: Fix permission loss
shell: bash
run: |
ls ./target/codspeed/oxc_benchmark
chmod +x ./target/codspeed/oxc_benchmark/*
Expand Down Expand Up @@ -225,10 +233,9 @@ jobs:
# - name: Checkout Branch
# uses: taiki-e/checkout-action@v1

# - name: Install Rust Toolchain
# uses: ./.github/actions/rustup
# - uses: Boshen/setup-rust@main
# with:
# shared-key: 'benchmark_napi'
# shared-key: benchmark_napi
# save-cache: ${{ github.ref_name == 'main' }}

# - name: Install codspeed
Expand Down Expand Up @@ -270,7 +277,6 @@ jobs:
# - name: Build Rust benchmark
# env:
# RUSTFLAGS: "-C debuginfo=2 -C strip=none -g --cfg codspeed"
# shell: bash
# run: |
# cargo build --release -p oxc_benchmark --bench parser_napi --no-default-features --features codspeed_napi
# mkdir -p target/codspeed/oxc_benchmark/
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/bloat.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:

- name: Run
run: |
export CMD="cargo bloat --profile release-debug -p oxc_cli --bin oxlint --features allocator"
export CMD="cargo bloat --profile release-debug -p oxlint --features allocator"
# Get largest functions
export BLOAT_FUNC_CMD="${CMD} -n 10"
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/cargo-llvm-lines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,7 @@ jobs:
- name: Checkout
uses: taiki-e/checkout-action@v1

- name: Install Rust Toolchain
uses: ./.github/actions/rustup
- uses: Boshen/setup-rust@main

- name: Install cargo-llvm-lines
uses: taiki-e/install-action@v2
Expand Down
Loading

0 comments on commit 12bdddc

Please sign in to comment.