Skip to content

Commit d2aa97b

Browse files
committed
Merge branch 't3/ci-merge-small-jobs' into t3/ci-sticky-deps
2 parents 1b7767c + bbfc047 commit d2aa97b

1 file changed

Lines changed: 33 additions & 34 deletions

File tree

‎.github/workflows/ci.yml‎

Lines changed: 33 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ jobs:
3535
test_web: ${{ steps.detect.outputs.test_web }}
3636
test_server: ${{ steps.detect.outputs.test_server }}
3737
rust: ${{ steps.detect.outputs.rust }}
38+
release_smoke: ${{ steps.detect.outputs.release_smoke }}
3839
mobile_native: ${{ steps.detect.outputs.mobile_native }}
3940
steps:
4041
# Only the package manifests the script reads to build the dependency graph.
@@ -54,19 +55,14 @@ jobs:
5455
id: detect
5556
uses: ./.github/actions/ci-changes
5657

57-
# Lint and the desktop build keep separate runners so their checks can run
58-
# side by side. Typecheck shares the build's install, and release smoke shares
59-
# lint's install. Lint always runs and formats every file, docs included; it
60-
# gates release smoke itself rather than waiting ~15s for `changes`. The
61-
# `Check` job at the end of this file passes only when every other job passes
62-
# or was skipped by `changes`.
58+
# Lint and the desktop build each get a runner so they run side by side.
59+
# Typecheck shares the build's install. Lint always runs: it formats every
60+
# file, docs included. The `Check` job at the end of this file passes only
61+
# when every other job passes or was skipped by `changes`.
6362
lint:
6463
name: Lint
6564
runs-on: blacksmith-8vcpu-ubuntu-2404
6665
timeout-minutes: 10
67-
permissions:
68-
contents: read
69-
pull-requests: read
7066
steps:
7167
- name: Checkout
7268
uses: actions/checkout@v6
@@ -84,25 +80,9 @@ jobs:
8480
exit 1
8581
fi
8682
87-
- name: Detect affected jobs
88-
id: changes
89-
uses: ./.github/actions/ci-changes
90-
9183
- name: Setup Vite+
9284
uses: ./.github/actions/setup-ci-deps
9385

94-
# Runs in the background next to the lint steps, so merging it into this
95-
# job adds no time; the last step reports its result.
96-
- name: Start release smoke
97-
id: smoke
98-
if: steps.changes.outputs.release_smoke != 'false'
99-
run: |
100-
(
101-
set +e
102-
node scripts/release-smoke.ts
103-
echo "$?" > "$RUNNER_TEMP/smoke-status"
104-
) > "$RUNNER_TEMP/smoke.log" 2>&1 < /dev/null &
105-
10686
- name: Ensure Electron runtime is installed
10787
run: vp run --filter @t3tools/desktop ensure:electron
10888

@@ -113,15 +93,6 @@ jobs:
11393
- name: Check
11494
run: vp check
11595

116-
# Reports even when an earlier lint step failed, as its own job did.
117-
- name: Exercise release-only workflow steps
118-
if: ${{ !cancelled() && steps.smoke.outcome == 'success' }}
119-
timeout-minutes: 5
120-
run: |
121-
until test -s "$RUNNER_TEMP/smoke-status"; do sleep 1; done
122-
cat "$RUNNER_TEMP/smoke.log"
123-
exit "$(cat "$RUNNER_TEMP/smoke-status")"
124-
12596
build:
12697
name: Build and Typecheck
12798
needs: changes
@@ -479,6 +450,33 @@ jobs:
479450
- name: Lint mobile native sources
480451
run: vp run lint:mobile
481452

453+
release_smoke:
454+
name: Release Smoke
455+
needs: changes
456+
if: ${{ !cancelled() && needs.changes.outputs.release_smoke != 'false' }}
457+
runs-on: blacksmith-8vcpu-ubuntu-2404
458+
timeout-minutes: 10
459+
steps:
460+
- name: Checkout
461+
uses: actions/checkout@v6
462+
with:
463+
sparse-checkout: |
464+
/*
465+
!/.repos/
466+
sparse-checkout-cone-mode: false
467+
468+
- name: Setup Vite+
469+
uses: voidzero-dev/setup-vp@v1
470+
with:
471+
node-version-file: package.json
472+
cache: true
473+
run-install: |
474+
args:
475+
- --filter=@t3tools/scripts...
476+
477+
- name: Exercise release-only workflow steps
478+
run: node scripts/release-smoke.ts
479+
482480
# Branch protection requires this job by its name, `Check`. It fails when any
483481
# other job fails, is cancelled, or is skipped without a reason, so splitting
484482
# or resharding jobs needs no ruleset change. Add every new job to `needs`.
@@ -498,6 +496,7 @@ jobs:
498496
transfer-report,
499497
rust,
500498
mobile_native_static_analysis,
499+
release_smoke,
501500
]
502501
runs-on: blacksmith-2vcpu-ubuntu-2404
503502
timeout-minutes: 5

0 commit comments

Comments
 (0)