Skip to content

Commit 45bfb2c

Browse files
hyf0hyf0
authored
Merge branch 'main' into codex/fix-debug-dynamic-imports-8549
2 parents e6acda8 + 8ace1b8 commit 45bfb2c

File tree

9 files changed

+28
-96
lines changed

9 files changed

+28
-96
lines changed

‎.github/workflows/cache-warmup.yml‎

Lines changed: 0 additions & 80 deletions
This file was deleted.

‎.github/workflows/ci.yml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,8 @@ jobs:
8080
uses: oxc-project/setup-rust@c8224157c0bf235aabc633e8cd50d344f087a7de # v1.0.12
8181
with:
8282
tools: just
83-
cache-key: debug-build
83+
cache-key: lint
84+
save-cache: ${{ github.ref_name == 'main' }}
8485
components: clippy rustfmt
8586

8687
- run: just lint-rust
@@ -231,7 +232,8 @@ jobs:
231232
uses: oxc-project/setup-rust@c8224157c0bf235aabc633e8cd50d344f087a7de # v1.0.12
232233
with:
233234
tools: just
234-
cache-key: debug-build
235+
cache-key: native-build
236+
save-cache: ${{ github.ref_name == 'main' }}
235237

236238
- uses: oxc-project/setup-node@8958a8e040102244b619c4a94fccb657a44b1c21 # v1.0.6
237239

‎.github/workflows/copilot-setup-steps.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030

3131
- uses: oxc-project/setup-rust@c8224157c0bf235aabc633e8cd50d344f087a7de # v1.0.12
3232
with:
33-
cache-key: debug-build
33+
cache-key: lint
3434
save-cache: false
3535
tools: just,cargo-insta,typos-cli,cargo-shear
3636
components: clippy rust-docs rustfmt

‎.github/workflows/metric.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,8 @@ jobs:
2626
- uses: taiki-e/checkout-action@3ab630d442e198ebb0ca30872832406ca01c46eb # v1.4.0
2727
- uses: oxc-project/setup-rust@c8224157c0bf235aabc633e8cd50d344f087a7de # v1.0.12
2828
with:
29-
cache-key: release-build
29+
cache-key: metric
30+
save-cache: ${{ github.ref_name == 'main' }}
3031
- run: cargo clean # build from scratch using local system cache to avoid download from crates.io
3132
- id: run
3233
run: |

‎.github/workflows/reusable-cargo-test.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,8 @@ jobs:
3636
uses: oxc-project/setup-rust@c8224157c0bf235aabc633e8cd50d344f087a7de # v1.0.12
3737
with:
3838
tools: just
39-
cache-key: debug-build
39+
cache-key: cargo-test
40+
save-cache: ${{ github.ref_name == 'main' }}
4041

4142
- uses: oxc-project/setup-node@8958a8e040102244b619c4a94fccb657a44b1c21 # v1.0.6
4243

‎.github/workflows/reusable-native-build.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,8 @@ jobs:
3636
uses: oxc-project/setup-rust@c8224157c0bf235aabc633e8cd50d344f087a7de # v1.0.12
3737
with:
3838
tools: just
39-
cache-key: debug-build
39+
cache-key: native-build
40+
save-cache: ${{ github.ref_name == 'main' }}
4041

4142
- uses: oxc-project/setup-node@8958a8e040102244b619c4a94fccb657a44b1c21 # v1.0.6
4243

‎.github/workflows/reusable-release-build.yml‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,9 @@ jobs:
8282
- name: Setup Rust
8383
uses: oxc-project/setup-rust@c8224157c0bf235aabc633e8cd50d344f087a7de # v1.0.12
8484
with:
85-
cache-key: release-${{ matrix.target }}
86-
save-cache: ${{ github.ref_name == 'main' }}
85+
# No caching to avoid cache poisoning in release artifacts
86+
restore-cache: false
87+
save-cache: false
8788

8889
- name: Rustup Adds Target
8990
run: rustup target add ${{ matrix.target }}
@@ -253,8 +254,9 @@ jobs:
253254
- name: Setup Rust
254255
uses: oxc-project/setup-rust@c8224157c0bf235aabc633e8cd50d344f087a7de # v1.0.12
255256
with:
256-
cache-key: release-wasm32-wasip1-threads
257-
save-cache: ${{ github.ref_name == 'main' }}
257+
# No caching to avoid cache poisoning in release artifacts
258+
restore-cache: false
259+
save-cache: false
258260

259261
- name: Add WASI target
260262
run: rustup target add wasm32-wasip1-threads
@@ -300,8 +302,9 @@ jobs:
300302
- name: Setup Rust
301303
uses: oxc-project/setup-rust@c8224157c0bf235aabc633e8cd50d344f087a7de # v1.0.12
302304
with:
303-
# `@rolldown/debug` only rely on debug build to produce code in `src/generated`.
304-
cache-key: debug-build
305+
# No caching to avoid cache poisoning in release artifacts
306+
restore-cache: false
307+
save-cache: false
305308

306309
- uses: oxc-project/setup-node@8958a8e040102244b619c4a94fccb657a44b1c21 # v1.0.6
307310

‎.github/workflows/update-test-dependencies.yml‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,8 @@ jobs:
102102
uses: oxc-project/setup-rust@c8224157c0bf235aabc633e8cd50d344f087a7de # v1.0.12
103103
with:
104104
tools: just
105-
cache-key: debug-build
105+
cache-key: native-build
106+
save-cache: false
106107

107108
- if: steps.check-update.outputs.update_needed == 'true'
108109
uses: oxc-project/setup-node@8958a8e040102244b619c4a94fccb657a44b1c21 # v1.0.6
@@ -212,7 +213,8 @@ jobs:
212213
uses: oxc-project/setup-rust@c8224157c0bf235aabc633e8cd50d344f087a7de # v1.0.12
213214
with:
214215
tools: just
215-
cache-key: debug-build
216+
cache-key: native-build
217+
save-cache: false
216218

217219
- if: steps.check-update.outputs.update_needed == 'true'
218220
uses: oxc-project/setup-node@8958a8e040102244b619c4a94fccb657a44b1c21 # v1.0.6
@@ -321,7 +323,8 @@ jobs:
321323
uses: oxc-project/setup-rust@c8224157c0bf235aabc633e8cd50d344f087a7de # v1.0.12
322324
with:
323325
tools: just
324-
cache-key: debug-build
326+
cache-key: native-build
327+
save-cache: false
325328

326329
- if: steps.check-update.outputs.update_needed == 'true'
327330
uses: oxc-project/setup-node@8958a8e040102244b619c4a94fccb657a44b1c21 # v1.0.6

‎.github/workflows/vite-tests.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,8 @@ jobs:
4949
uses: oxc-project/setup-rust@c8224157c0bf235aabc633e8cd50d344f087a7de # v1.0.12
5050
with:
5151
tools: just
52-
cache-key: debug-build
52+
cache-key: native-build
53+
save-cache: ${{ github.ref_name == 'main' }}
5354

5455
- uses: oxc-project/setup-node@8958a8e040102244b619c4a94fccb657a44b1c21 # v1.0.6
5556

0 commit comments

Comments
 (0)