Skip to content

Commit 4ba8e94

Browse files
committed
Merge remote-tracking branch 'origin/main' into feat/every_commit_upload_perf_data
2 parents 3c59174 + 042c12b commit 4ba8e94

File tree

242 files changed

+3864
-2683
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

242 files changed

+3864
-2683
lines changed

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,10 @@
1-
<!--
2-
Thank you for submitting a pull request!
3-
4-
We appreciate the time and effort you have invested in making these changes. Please ensure that you provide enough information to allow others to review your pull request.
5-
6-
Upon submission, your pull request will be automatically assigned with reviewers.
7-
8-
If you want to learn more about contributing to this project, please visit: https://github.com/web-infra-dev/rspack/blob/main/CONTRIBUTING.md.
9-
-->
10-
111
## Summary
122

13-
<!-- Can you explain the reasoning behind implementing this change? What problem or issue does this pull request resolve? -->
3+
<!-- Describe what this PR does and why. -->
4+
5+
## Related links
146

15-
<!-- It would be helpful if you could provide any relevant context, such as GitHub issues or related discussions. -->
7+
<!-- Related issues or discussions. -->
168

179
## Checklist
1810

.github/actions/rustup/action.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ runs:
3737
3838
- name: Restore rustup cache
3939
id: restore
40+
if: ${{ inputs.save-if == 'true' }}
4041
uses: ./.github/actions/cache/restore
4142
with:
4243
path: ~/.rustup/toolchains
@@ -63,7 +64,8 @@ runs:
6364
key: rustup-cache-v2-${{ runner.os }}-${{ steps.get-toolchain.outputs.toolchain }}
6465

6566
- name: Cargo cache
67+
if: ${{ runner.environment != 'self-hosted' || runner.os != 'Windows' }}
6668
uses: ./.github/actions/rustup/cargo
6769
with:
6870
key: ${{ inputs.key }}
69-
save-if: ${{ inputs.save-if }}
71+
save-if: ${{ inputs.save-if == 'true' }}

.github/pr-labeler.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,5 @@
88
- "/^fix/"
99
"release: document":
1010
- "/^docs/"
11+
"release: refactor":
12+
- "/^refactor/"

.github/release.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,15 @@ changelog:
1414
- title: Performance Improvements ⚡
1515
labels:
1616
- "release: performance"
17-
- title: Exciting New Features 🎉
17+
- title: New Features 🎉
1818
labels:
1919
- "release: feature"
2020
- title: Bug Fixes 🐞
2121
labels:
2222
- "release: bug fix"
23+
- title: Refactor 🔨
24+
labels:
25+
- "release: refactor"
2326
- title: Document Updates 📖
2427
labels:
2528
- "release: document"

.github/teams.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
team:
22
- "@hardfist"
3+
- "@zoolsher"
34
- "@h-a-n-a"
45
- "@bvanjoi"
56
- "@ahabhgk"
@@ -21,3 +22,5 @@ team:
2122
- "@Timeless0911"
2223
- "@GiveMe-A-Name"
2324
- "@stormslowly"
25+
- "@quininer"
26+
- "@CPunisher"

.github/workflows/ci.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ jobs:
6060
runner: ${{ vars.LINUX_SELF_HOSTED_RUNNER_LABELS || '"ubuntu-22.04"' }}
6161
test: true
6262
bench: true
63+
prefer_docker: false
6364

6465
test-windows:
6566
name: Test Windows
@@ -69,7 +70,8 @@ jobs:
6970
with:
7071
target: x86_64-pc-windows-msvc
7172
profile: "dev"
72-
runner: ${{ vars.WINDOWS_RUNNER_LABELS || '"windows-latest"' }}
73+
runner: ${{ vars.WINDOWS_SELF_HOSTED_RUNNER_LABELS || '"windows-latest"' }}
74+
test-runner: '"windows-latest"'
7375
test: true
7476

7577
test-mac:

.github/workflows/ecosystem-benchmark.yml

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26,18 +26,13 @@ permissions:
2626
pull-requests: write
2727

2828
jobs:
29-
get-runner-labels:
30-
name: Get Runner Labels
31-
uses: ./.github/workflows/get-runner-labels.yml
32-
3329
build:
3430
name: Test Linux
35-
needs: [get-runner-labels]
3631
uses: ./.github/workflows/reusable-build.yml
3732
with:
3833
target: x86_64-unknown-linux-gnu
39-
runner: ${{ fromJSON(vars.LINUX_SELF_HOSTED_RUNNER_LABELS || '"ubuntu-latest"') }}
40-
ref: ${{ github.sha }}
34+
runner: ${{ vars.LINUX_SELF_HOSTED_RUNNER_LABELS || '"ubuntu-latest"' }}
35+
ref: ${{ github.event_name == 'workflow_dispatch' && format('refs/pull/{0}/head', inputs.pr) || github.sha }}
4136
profile: "release"
4237
test: false
4338
bench: false
@@ -99,4 +94,4 @@ jobs:
9994
git config --global user.name "github-actions[bot]"
10095
git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com"
10196
cd rspack-ecosystem-benchmark
102-
RSPACK_DIR="$RSPACK_DIR" GITHUB_ACTOR=x-access-token node bin/upload.js bench ${{ secrets.PERF_DATA_TOKEN }} ${{ github.sha }}
97+
RSPACK_DIR="$RSPACK_DIR" GITHUB_ACTOR=x-access-token node bin/upload.js ${{ secrets.PERF_DATA_TOKEN }} ${{ github.sha }}

.github/workflows/preview-commit.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
needs: [get-runner-labels, check-changed]
3636
if: needs.check-changed.outputs.changed == 'true'
3737
strategy:
38-
fail-fast: false # Build and test everything so we can look at all the errors
38+
fail-fast: true # for better utilize ci runners
3939
matrix:
4040
array:
4141
- target: x86_64-unknown-linux-gnu

.github/workflows/release-canary.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
name: Build Canary
4141
needs: [get-runner-labels]
4242
strategy:
43-
fail-fast: false # Build and test everything so we can look at all the errors
43+
fail-fast: true # for better utilize ci runners
4444
matrix:
4545
array:
4646
- target: x86_64-unknown-linux-gnu
@@ -61,6 +61,8 @@ jobs:
6161
runner: ${{ needs.get-runner-labels.outputs.MACOS_RUNNER_LABELS }}
6262
- target: aarch64-apple-darwin
6363
runner: ${{ needs.get-runner-labels.outputs.MACOS_RUNNER_LABELS }}
64+
- target: wasm32-wasip1-threads
65+
runner: ${{ needs.get-runner-labels.outputs.LINUX_RUNNER_LABELS }}
6466
uses: ./.github/workflows/reusable-build.yml
6567
with:
6668
ref: ${{inputs.commit}}
@@ -91,6 +93,9 @@ jobs:
9193
with:
9294
path: artifacts
9395

96+
- name: Clean artifacts
97+
run: find artifacts -type f -name '*.d.ts' | xargs rm -f
98+
9499
- name: Move artifacts
95100
run: node scripts/build-npm.cjs
96101

.github/workflows/release-debug.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,9 @@ jobs:
4848
with:
4949
path: artifacts
5050

51+
- name: Clean artifacts
52+
run: find artifacts -type f -name '*.d.ts' | xargs rm -f
53+
5154
- name: Move artifacts
5255
run: node scripts/build-npm.cjs
5356

0 commit comments

Comments
 (0)