Skip to content

Commit

Permalink
chore: merge origin main
Browse files Browse the repository at this point in the history
  • Loading branch information
SyMind committed Dec 23, 2024
2 parents a501df0 + 56ee43c commit b171de6
Show file tree
Hide file tree
Showing 117 changed files with 10,143 additions and 1,817 deletions.
1 change: 0 additions & 1 deletion .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ pnpm-lock.yaml
/crates/node_binding
/crates/rspack_ast_viewer
/crates/rspack_base64
/crates/rspack_binding_options
/crates/rspack_core
/crates/rspack_core/src/compiler/make @jerrykingxyz
/crates/rspack_error
Expand Down
2 changes: 0 additions & 2 deletions .github/auto_assign.yml

This file was deleted.

10 changes: 0 additions & 10 deletions .github/workflows/auto-assign.yaml

This file was deleted.

83 changes: 0 additions & 83 deletions .github/workflows/bench.yml

This file was deleted.

6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ jobs:
uses: ./.github/workflows/reusable-build.yml
with:
target: x86_64-unknown-linux-gnu
native: ${{ needs.get-runner-labels.outputs.LINUX_RUNNER_LABELS == '"ubuntu-latest"' }}
native: ${{ needs.get-runner-labels.outputs.LINUX_RUNNER_LABELS == '"ubuntu-22.04"' }}
runner: ${{ needs.get-runner-labels.outputs.LINUX_RUNNER_LABELS }}
skipable: ${{ needs.check-changed.outputs.changed != 'true' }}
bench: true
Expand Down Expand Up @@ -319,7 +319,7 @@ jobs:
- name: Run test
# reason for excluding https://github.com/napi-rs/napi-rs/issues/2200
run: cargo test --workspace --exclude rspack_binding_options --exclude rspack_node -- --nocapture
run: cargo test --workspace --exclude rspack_node -- --nocapture

rust_test_miri:
name: Rust test miri
Expand Down Expand Up @@ -350,7 +350,7 @@ jobs:
env:
MIRIFLAGS: -Zmiri-tree-borrows -Zmiri-disable-isolation
# reason for excluding https://github.com/napi-rs/napi-rs/issues/2200
run: cargo miri test --workspace --exclude rspack_binding_options --exclude rspack_node -- --nocapture
run: cargo miri test --workspace --exclude rspack_node -- --nocapture

run_benchmark:
name: Run benchmark
Expand Down
120 changes: 0 additions & 120 deletions .github/workflows/diff.yml.bak

This file was deleted.

5 changes: 2 additions & 3 deletions .github/workflows/ecosystem-ci-trigger.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
name: ecosystem-ci trigger

on:
issue_comment:
types: [created]
# TODO: switch to workflow_dispatch
# on:

jobs:
trigger:
Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/get-runner-labels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ on:
jobs:
main:
name: Get Runner Labels
runs-on: [self-hosted, Linux, ci]
runs-on: [ubuntu-22.04]
outputs:
LINUX_RUNNER_LABELS: ${{ steps.run.outputs.LINUX_RUNNER_LABELS }}
MACOS_RUNNER_LABELS: ${{ steps.run.outputs.MACOS_RUNNER_LABELS }}
Expand All @@ -37,8 +37,9 @@ jobs:
WINDOWS_RUNNER_LABELS='${{ vars.WINDOWS_RUNNER_LABELS }}';
fi
# set default value
# use ubuntu 22.04 to be compatible with playwright docker
if [[ -z "$LINUX_RUNNER_LABELS" ]]; then
LINUX_RUNNER_LABELS='"ubuntu-latest"';
LINUX_RUNNER_LABELS='"ubuntu-22.04"';
fi
if [[ -z "$MACOS_RUNNER_LABELS" ]]; then
MACOS_RUNNER_LABELS='"macos-latest"';
Expand Down
33 changes: 0 additions & 33 deletions .github/workflows/github-issue-sync.yml

This file was deleted.

22 changes: 0 additions & 22 deletions .github/workflows/issue-mark-assignee.yml

This file was deleted.

3 changes: 0 additions & 3 deletions .github/workflows/release-pull-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,3 @@ jobs:
createGithubReleases: false
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
REPOSITORY: ${{ github.repository }}
REF: ${{ github.ref }}
2 changes: 2 additions & 0 deletions .github/workflows/reusable-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -274,6 +274,8 @@ jobs:
- name: Run e2e
uses: ./.github/actions/docker-run
with:
# Jammy uses ubuntu 22.04
# If this is to change, make sure to upgrade the ubuntu version in GitHub Actions
image: mcr.microsoft.com/playwright:v1.47.0-jammy
# .cache is required by download artifact, and mount in ./.github/actions/docker-run
# .tool_cache is required by pnpm
Expand Down
Loading

0 comments on commit b171de6

Please sign in to comment.