Skip to content

Commit 3ab49ca

Browse files
Merge remote-tracking branch 'origin/main' into pr-18361
# Conflicts: # apps/web/src/components/settings/ProjectDefaultsSettings.tsx # apps/web/src/components/settings/SettingsPanels.tsx # apps/web/src/components/settings/SourceControlWritingSettings.tsx
2 parents 7ccf473 + 07f7f97 commit 3ab49ca

326 files changed

Lines changed: 13277 additions & 5472 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/actions/setup-ci-deps/action.yml‎

Lines changed: 75 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,14 @@ inputs:
55
description: Read-only credential for the private maintainer task cache
66
required: false
77
default: ""
8+
install:
9+
description: Set to "false" to set up Vite+ only, with no pnpm store or install
10+
required: false
11+
default: "true"
12+
install-args:
13+
description: Arguments for `vp install`, such as filters. Empty installs the whole workspace.
14+
required: false
15+
default: ""
816
runs:
917
using: composite
1018
steps:
@@ -19,10 +27,11 @@ runs:
1927
echo "node=$(jq -r '.engines.node' package.json)" >> "$GITHUB_OUTPUT"
2028
echo "pnpm=$(jq -r '.packageManager' package.json)" >> "$GITHUB_OUTPUT"
2129
30+
# Pinned because release-desktop.yml signs builds with this action in the job.
2231
- name: Cache Vite+
2332
id: vp_cache
2433
if: steps.vp.outputs.version != ''
25-
uses: actions/cache@v6
34+
uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6
2635
with:
2736
path: ~/.vite-plus
2837
key: vite-plus-home-v2-${{ runner.os }}-${{ runner.arch }}-${{ steps.vp.outputs.version }}-node${{ steps.vp.outputs.node }}-${{ steps.vp.outputs.pnpm }}
@@ -38,38 +47,93 @@ runs:
3847
echo "$HOME/.vite-plus/bin" >> "$GITHUB_PATH"
3948
"$HOME/.vite-plus/bin/vp" env use "${{ steps.vp.outputs.node }}"
4049
50+
# vp gives each Node.js download attempt 10 minutes by default, so one
51+
# stalled stream holds the job that long. It retries 3 times and resumes
52+
# partial bytes, so a shorter limit costs a slow download only a retry.
4153
- name: Setup Vite+
4254
if: steps.vp_cache.outputs.cache-hit != 'true'
43-
uses: voidzero-dev/setup-vp@v1
55+
uses: voidzero-dev/setup-vp@250f29ce396baf5e8f24498e17c0dfdebabc26eb # v1
56+
env:
57+
VP_DOWNLOAD_TIMEOUT: "120"
4458
with:
4559
node-version-file: package.json
4660
cache: false
4761
run-install: false
4862

49-
- name: Resolve pnpm store path
63+
# A shared key lets whichever install saves first, often a small filtered
64+
# one, become every job's store. Each set of install args gets its own.
65+
- name: Resolve pnpm store
5066
id: pnpm_store
67+
if: inputs.install == 'true'
5168
shell: bash
69+
env:
70+
INSTALL_ARGS: ${{ inputs.install-args }}
5271
run: |
53-
store_path="$(vp pm cache dir)"
54-
echo "path=$store_path" >> "$GITHUB_OUTPUT"
72+
echo "path=$(vp pm cache dir)" >> "$GITHUB_OUTPUT"
73+
metadata_dir="${pnpm_config_cache_dir:-$RUNNER_TEMP/pnpm-metadata}"
74+
echo "pnpm_config_cache_dir=$metadata_dir" >> "$GITHUB_ENV"
75+
echo "verified=$metadata_dir/lockfile-verified.jsonl" >> "$GITHUB_OUTPUT"
76+
if [[ -z "$INSTALL_ARGS" ]]; then
77+
echo "namespace=full" >> "$GITHUB_OUTPUT"
78+
else
79+
echo "namespace=filtered-$(printf '%s' "$INSTALL_ARGS" | cksum | cut -d' ' -f1)" >> "$GITHUB_OUTPUT"
80+
fi
5581
56-
# setup-vp's shared cache key ignores install filters. Keep full installs in a
57-
# separate namespace, including fallback restores.
82+
# Filtered installs prefer the current full store, which holds every package,
83+
# over an older store of their own.
5884
# The pnpm store stays a cache tarball on the runner's own disk. A store on a
5985
# Blacksmith sticky disk mounts in under a second, but pnpm then copies every
6086
# package across filesystems instead of hard-linking it: install took 28-49s
6187
# against 9s plus an 11s restore.
62-
- name: Cache full pnpm store
63-
uses: actions/cache@v6
88+
- name: Restore pnpm store
89+
id: pnpm_cache
90+
if: inputs.install == 'true'
91+
uses: actions/cache/restore@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6
6492
with:
6593
path: ${{ steps.pnpm_store.outputs.path }}
66-
key: pnpm-full-v1-${{ runner.os }}-${{ runner.arch }}-${{ hashFiles('pnpm-lock.yaml', 'pnpm-workspace.yaml', 'package.json') }}
94+
key: pnpm-${{ steps.pnpm_store.outputs.namespace }}-v1-${{ runner.os }}-${{ runner.arch }}-${{ hashFiles('pnpm-lock.yaml', 'pnpm-workspace.yaml', 'package.json') }}
6795
restore-keys: |
96+
pnpm-full-v1-${{ runner.os }}-${{ runner.arch }}-${{ hashFiles('pnpm-lock.yaml', 'pnpm-workspace.yaml', 'package.json') }}
97+
pnpm-${{ steps.pnpm_store.outputs.namespace }}-v1-${{ runner.os }}-${{ runner.arch }}-
6898
pnpm-full-v1-${{ runner.os }}-${{ runner.arch }}-
6999
100+
# pnpm accepts an earlier pass for the same lockfile and policy at any age, so
101+
# a cached record skips fetching registry metadata for every package.
102+
- name: Restore lockfile verification
103+
id: pnpm_verified
104+
if: inputs.install == 'true'
105+
uses: actions/cache/restore@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6
106+
with:
107+
path: ${{ steps.pnpm_store.outputs.verified }}
108+
key: pnpm-verified-v1-${{ hashFiles('pnpm-lock.yaml', 'pnpm-workspace.yaml', 'package.json') }}
109+
70110
- name: Install dependencies
111+
if: inputs.install == 'true'
71112
shell: bash
72-
run: vp install
113+
env:
114+
INSTALL_ARGS: ${{ inputs.install-args }}
115+
# Unquoted so each filter is its own argument.
116+
run: vp install $INSTALL_ARGS
117+
118+
- name: Save lockfile verification
119+
if: inputs.install == 'true' && steps.pnpm_verified.outputs.cache-hit != 'true'
120+
uses: actions/cache/save@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6
121+
with:
122+
path: ${{ steps.pnpm_store.outputs.verified }}
123+
key: ${{ steps.pnpm_verified.outputs.cache-primary-key }}
124+
125+
# A filtered install that started from the current full store adds nothing
126+
# worth a second copy of it.
127+
- name: Save pnpm store
128+
if: >-
129+
inputs.install == 'true' &&
130+
steps.pnpm_cache.outputs.cache-hit != 'true' &&
131+
(steps.pnpm_store.outputs.namespace == 'full' ||
132+
steps.pnpm_cache.outputs.cache-matched-key != format('pnpm-full-v1-{0}-{1}-{2}', runner.os, runner.arch, hashFiles('pnpm-lock.yaml', 'pnpm-workspace.yaml', 'package.json')))
133+
uses: actions/cache/save@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6
134+
with:
135+
path: ${{ steps.pnpm_store.outputs.path }}
136+
key: ${{ steps.pnpm_cache.outputs.cache-primary-key }}
73137

74138
- name: Enable shared task cache
75139
if: >-

‎.github/workflows/ci.yml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -354,7 +354,9 @@ jobs:
354354
id-token: write
355355
name: Test Server ${{ matrix.shard }}
356356
runs-on: blacksmith-4vcpu-ubuntu-2404
357-
timeout-minutes: 10
357+
# Shards take 2-5 minutes. When the shared task cache throttles reads, each
358+
# failed fetch stalls vp for 15-90s, which pushed shards past 10 minutes.
359+
timeout-minutes: 20
358360
strategy:
359361
fail-fast: false
360362
matrix:

‎.github/workflows/deploy-relay.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@ jobs:
8080
CLERK_SECRET_KEY: ${{ secrets.CLERK_SECRET_KEY }}
8181
APNS_PRIVATE_KEY: ${{ secrets.APNS_PRIVATE_KEY }}
8282
FCM_SERVICE_ACCOUNT: ${{ secrets.FCM_SERVICE_ACCOUNT }}
83+
T3CHAT_LINK_SECRET: ${{ secrets.T3CHAT_LINK_SECRET }}
8384

8485
- name: Publish relay deploy commit status
8586
uses: actions/github-script@v8

‎.github/workflows/relay-preview.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,3 +79,5 @@ jobs:
7979
PLANETSCALE_API_TOKEN: ${{ secrets.PLANETSCALE_API_TOKEN }}
8080
AXIOM_TOKEN: ${{ secrets.AXIOM_TOKEN }}
8181
CLERK_SECRET_KEY: ${{ secrets.CLERK_SECRET_KEY }}
82+
# Unset by default, so previews keep the T3 Chat link off.
83+
T3CHAT_LINK_SECRET: ${{ secrets.T3CHAT_LINK_SECRET }}

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

Lines changed: 61 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -147,13 +147,6 @@ jobs:
147147
git sparse-checkout set --no-cone '/*' '!/.repos/'
148148
git -c checkout.workers=0 checkout --detach FETCH_HEAD
149149
150-
- name: Setup Vite+
151-
uses: voidzero-dev/setup-vp@250f29ce396baf5e8f24498e17c0dfdebabc26eb # v1
152-
with:
153-
node-version-file: package.json
154-
cache: true
155-
run-install: false
156-
157150
# pnpm checks the lockfile and policy before reusing this result. A missing
158151
# artifact leaves the cache empty, so installation runs the checks again.
159152
- name: Download dependency verification
@@ -163,10 +156,12 @@ jobs:
163156
name: release-dependency-verification
164157
path: ${{ runner.temp }}/pnpm-metadata
165158

166-
- name: Install desktop dependencies
159+
- name: Setup dependencies
160+
uses: ./.github/actions/setup-ci-deps
161+
with:
162+
install-args: --filter=@t3tools/desktop... --filter=t3... --filter=@t3tools/scripts...
167163
env:
168164
pnpm_config_cache_dir: ${{ runner.temp }}/pnpm-metadata
169-
run: vp install --filter=@t3tools/desktop... --filter=t3... --filter=@t3tools/scripts...
170165

171166
- name: Cache resource monitor
172167
id: resource_monitor_cache
@@ -259,6 +254,63 @@ jobs:
259254
if [[ "${{ inputs.version }}" =~ -nightly\.[0-9]{8}\.[0-9]+$ ]]; then brand=nightly; fi
260255
node scripts/apply-web-brand-assets.ts "$brand" apps/server/dist/client
261256
257+
- name: Resolve target Node.js for the CLI executable
258+
id: target_node
259+
if: inputs.cli_archive && inputs.platform == 'win'
260+
shell: bash
261+
run: echo "version=$(node -p 'require("./package.json").engines.node')" >> "$GITHUB_OUTPUT"
262+
263+
# The download only changes with engines.node, so a cached copy keeps
264+
# releases off nodejs.org, which stalls on the runners some days.
265+
- name: Restore target Node.js for the CLI executable
266+
id: target_node_cache
267+
if: inputs.cli_archive && inputs.platform == 'win'
268+
uses: actions/cache/restore@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6
269+
with:
270+
path: ${{ runner.temp }}/node-download
271+
key: node-download-v${{ steps.target_node.outputs.version }}-win-${{ inputs.arch }}
272+
273+
# tsdown downloads the target Node with one fetch and no retry, and
274+
# nodejs.org drops that download often enough to fail releases. Seed
275+
# tsdown's cache with a retried, checksum-verified copy instead. A transfer
276+
# under 100 KB/s for 30s counts as failed, so a stall retries.
277+
- name: Download target Node.js for the CLI executable
278+
if: inputs.cli_archive && inputs.platform == 'win' && steps.target_node_cache.outputs.cache-hit != 'true'
279+
shell: bash
280+
env:
281+
VERSION: ${{ steps.target_node.outputs.version }}
282+
run: |
283+
set -euo pipefail
284+
name="node-v$VERSION-win-${{ inputs.arch }}"
285+
dir="$RUNNER_TEMP/node-download"
286+
mkdir -p "$dir"
287+
fetch=(curl -fsSL --retry 5 --retry-all-errors --connect-timeout 10 --speed-limit 102400 --speed-time 30)
288+
"${fetch[@]}" -o "$dir/$name.zip" "https://nodejs.org/dist/v$VERSION/$name.zip"
289+
"${fetch[@]}" -o "$dir/SHASUMS256.txt" "https://nodejs.org/dist/v$VERSION/SHASUMS256.txt"
290+
(cd "$dir" && grep " $name.zip\$" SHASUMS256.txt | sha256sum -c -)
291+
292+
# Saved right away so a later failure in this job still keeps the download.
293+
- name: Save target Node.js for the CLI executable
294+
if: inputs.cli_archive && inputs.platform == 'win' && steps.target_node_cache.outputs.cache-hit != 'true'
295+
uses: actions/cache/save@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6
296+
with:
297+
path: ${{ runner.temp }}/node-download
298+
key: ${{ steps.target_node_cache.outputs.cache-primary-key }}
299+
300+
- name: Install target Node.js for the CLI executable
301+
if: inputs.cli_archive && inputs.platform == 'win'
302+
shell: bash
303+
env:
304+
VERSION: ${{ steps.target_node.outputs.version }}
305+
run: |
306+
set -euo pipefail
307+
name="node-v$VERSION-win-${{ inputs.arch }}"
308+
dir="$RUNNER_TEMP/node-download"
309+
dest="${XDG_CACHE_HOME:-$HOME/.cache}/tsdown/node/v$VERSION/win-${{ inputs.arch }}"
310+
mkdir -p "$dest"
311+
(cd "$dir" && grep " $name.zip\$" SHASUMS256.txt | sha256sum -c -)
312+
unzip -p "$dir/$name.zip" "$name/node.exe" > "$dest/node.exe"
313+
262314
# Setup Vite+ selects the exact engines.node version from package.json.
263315
# Native builds embed that executable; cross-target builds download the
264316
# same version for their target.

0 commit comments

Comments
 (0)