Skip to content

Commit 8bf2fe6

Browse files
committed
Merge remote-tracking branch 'upstream/main' into fmy/perf
2 parents cac8748 + d3ee3e5 commit 8bf2fe6

211 files changed

Lines changed: 6552 additions & 596 deletions

File tree

Some content is hidden

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

‎.github/workflows/ci.yml‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -629,13 +629,37 @@ jobs:
629629
- name: Check core boundaries
630630
run: pnpm run check:core-boundaries
631631

632+
- name: Resolve Bun executable cache
633+
id: bun-cache-target
634+
if: needs.build-impact.outputs.frontend_required != 'false'
635+
run: node scripts/ci/bun-cache-target.mjs 1.3.14
636+
637+
- name: Restore Bun executable
638+
id: bun-executable-cache
639+
if: needs.build-impact.outputs.frontend_required != 'false'
640+
uses: actions/cache/restore@v5
641+
with:
642+
path: ${{ steps.bun-cache-target.outputs.path }}
643+
key: ${{ steps.bun-cache-target.outputs.key }}
644+
632645
- name: Setup Bun for package resource preflight
633646
if: needs.build-impact.outputs.frontend_required != 'false'
634647
uses: oven-sh/setup-bun@v2
635648
with:
636649
bun-version: "1.3.14"
650+
# Cache reads and writes are separate so PRs remain restore-only.
637651
no-cache: true
638652

653+
- name: Save Bun executable
654+
if: >-
655+
github.event_name == 'push' && github.ref == 'refs/heads/main' &&
656+
needs.build-impact.outputs.frontend_required != 'false' &&
657+
steps.bun-executable-cache.outputs.cache-hit != 'true'
658+
uses: actions/cache/save@v5
659+
with:
660+
path: ${{ steps.bun-cache-target.outputs.path }}
661+
key: ${{ steps.bun-cache-target.outputs.key }}
662+
639663
- name: Setup Rust for release projection preflight
640664
if: needs.build-impact.outputs.frontend_required != 'false'
641665
uses: dtolnay/rust-toolchain@stable

‎.github/workflows/desktop-package.yml‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -331,12 +331,40 @@ jobs:
331331
node-version: 22
332332
cache: pnpm
333333

334+
- name: Resolve Bun executable cache
335+
id: bun-cache-target
336+
shell: bash
337+
run: |
338+
if [[ -f scripts/ci/bun-cache-target.mjs ]]; then
339+
node scripts/ci/bun-cache-target.mjs 1.3.14
340+
else
341+
echo "::notice::Bun caching is unavailable for this older source revision; setup-bun will install it normally."
342+
fi
343+
344+
- name: Restore Bun executable
345+
id: bun-executable-cache
346+
if: steps.bun-cache-target.outputs.key != ''
347+
uses: actions/cache/restore@v5
348+
with:
349+
path: ${{ steps.bun-cache-target.outputs.path }}
350+
key: ${{ steps.bun-cache-target.outputs.key }}
351+
334352
- name: Setup Bun
335353
uses: oven-sh/setup-bun@v2
336354
with:
337355
bun-version: "1.3.14"
338356
no-cache: true
339357

358+
- name: Save Bun executable
359+
if: >-
360+
(github.event_name == 'release' || github.event_name == 'workflow_dispatch') &&
361+
steps.bun-cache-target.outputs.key != '' &&
362+
steps.bun-executable-cache.outputs.cache-hit != 'true'
363+
uses: actions/cache/save@v5
364+
with:
365+
path: ${{ steps.bun-cache-target.outputs.path }}
366+
key: ${{ steps.bun-cache-target.outputs.key }}
367+
340368
- name: Setup Rust toolchain
341369
uses: dtolnay/rust-toolchain@stable
342370
with:

‎.github/workflows/linux-binaries.yml‎

Lines changed: 33 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -79,17 +79,46 @@ jobs:
7979
with:
8080
ref: ${{ inputs.checkout_ref }}
8181

82+
- name: Setup Node.js
83+
uses: actions/setup-node@v5
84+
with:
85+
node-version-file: package.json
86+
package-manager-cache: false
87+
88+
- name: Resolve Bun executable cache
89+
id: bun-cache-target
90+
shell: bash
91+
run: |
92+
if [[ -f scripts/ci/bun-cache-target.mjs ]]; then
93+
node scripts/ci/bun-cache-target.mjs 1.3.14
94+
else
95+
echo "::notice::Bun caching is unavailable for this older source revision; setup-bun will install it normally."
96+
fi
97+
98+
- name: Restore Bun executable
99+
id: bun-executable-cache
100+
if: steps.bun-cache-target.outputs.key != ''
101+
uses: actions/cache/restore@v5
102+
with:
103+
path: ${{ steps.bun-cache-target.outputs.path }}
104+
key: ${{ steps.bun-cache-target.outputs.key }}
105+
82106
- name: Setup Bun
83107
uses: oven-sh/setup-bun@v2
84108
with:
85109
bun-version: "1.3.14"
86110
no-cache: true
87111

88-
- name: Setup Node.js
89-
uses: actions/setup-node@v5
112+
- name: Save Bun executable
113+
if: >-
114+
inputs.cache_write && github.event_name != 'pull_request' &&
115+
github.event_name != 'pull_request_target' &&
116+
steps.bun-cache-target.outputs.key != '' &&
117+
steps.bun-executable-cache.outputs.cache-hit != 'true'
118+
uses: actions/cache/save@v5
90119
with:
91-
node-version-file: package.json
92-
package-manager-cache: false
120+
path: ${{ steps.bun-cache-target.outputs.path }}
121+
key: ${{ steps.bun-cache-target.outputs.key }}
93122

94123
- name: Build plugin Host resources
95124
run: |

‎.github/workflows/nightly-artifacts.yml‎

Lines changed: 35 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -89,12 +89,6 @@ jobs:
8989
with:
9090
ref: ${{ inputs.checkout_ref }}
9191

92-
- name: Setup Bun
93-
uses: oven-sh/setup-bun@v2
94-
with:
95-
bun-version: "1.3.14"
96-
no-cache: true
97-
9892
- name: Install Linux system dependencies (Tauri bundler)
9993
if: runner.os == 'Linux'
10094
shell: bash
@@ -147,6 +141,41 @@ jobs:
147141
node-version: 22
148142
package-manager-cache: false
149143

144+
- name: Resolve Bun executable cache
145+
id: bun-cache-target
146+
shell: bash
147+
run: |
148+
if [[ -f scripts/ci/bun-cache-target.mjs ]]; then
149+
node scripts/ci/bun-cache-target.mjs 1.3.14
150+
else
151+
echo "::notice::Bun caching is unavailable for this older source revision; setup-bun will install it normally."
152+
fi
153+
154+
- name: Restore Bun executable
155+
id: bun-executable-cache
156+
if: steps.bun-cache-target.outputs.key != ''
157+
uses: actions/cache/restore@v5
158+
with:
159+
path: ${{ steps.bun-cache-target.outputs.path }}
160+
key: ${{ steps.bun-cache-target.outputs.key }}
161+
162+
- name: Setup Bun
163+
uses: oven-sh/setup-bun@v2
164+
with:
165+
bun-version: "1.3.14"
166+
no-cache: true
167+
168+
- name: Save Bun executable
169+
if: >-
170+
inputs.cache_write && github.event_name != 'pull_request' &&
171+
github.event_name != 'pull_request_target' &&
172+
steps.bun-cache-target.outputs.key != '' &&
173+
steps.bun-executable-cache.outputs.cache-hit != 'true'
174+
uses: actions/cache/save@v5
175+
with:
176+
path: ${{ steps.bun-cache-target.outputs.path }}
177+
key: ${{ steps.bun-cache-target.outputs.key }}
178+
150179
- name: Setup Rust toolchain
151180
uses: dtolnay/rust-toolchain@stable
152181
with:

‎.release-please-manifest.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
".": "1.0.9"
2+
".": "1.0.10"
33
}

0 commit comments

Comments
 (0)