You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
{{ message }}
Repository navigation
Commit ad3f49a
Browse filesBrowse the repository at this point in the historyBrowse files
ci(fork): run fork tests in Fork Sync and report Fork CI failures
A Fork Sync merge without conflicts went to main while it broke a fork
feature (pingdotgg#37), and Fork CI stayed red on main for a day (pingdotgg#38). Fork Sync now
runs the test files that differ from upstream before it pushes. A failed Fork
CI run on main calls the repair agent, like Fork Sync and Fork Release.
Copy file name to clipboardExpand all lines: docs/fork.md
+4-3Lines changed: 4 additions & 3 deletions
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -7,16 +7,17 @@ The installed app updates itself from the fork releases through the built-in upd
7
7
8
8
Fork main only moves forward. Nothing rebases or force-pushes it.
9
9
10
-
-`.github/workflows/fork-sync.yml` merges `pingdotgg/t3code` main into fork main every day. It typechecks the mergeand pushes it as a fast-forward. If main moved during the run, it merges the new main and pushes again.
11
-
- If the merge conflicts or the typecheck fails, the sync comments on the issue "Fork sync: upstream merge failed" and stops.
10
+
-`.github/workflows/fork-sync.yml` merges `pingdotgg/t3code` main into fork main every day. It typechecks the merge, runs the fork tests and pushes it as a fast-forward. The fork tests are the test files that differ from upstream main. If main moved during the run, it merges the new main and pushes again.
11
+
- If the merge conflicts, the typecheck fails or a fork test fails, the sync comments on the issue "Fork sync: upstream merge failed" and stops.
12
12
-`.github/workflows/fork-release.yml` builds the desktop apps. It runs when a push to main changes the app shell (`apps/desktop` without its tests, icons, build config, dependencies), once a day, and on manual dispatch. If the commit already has a release, it stops early. Server and web changes reach the machines without a release, see "Live server updates" and "Deploy to the VPS".
13
13
- The release builds macOS arm64 (signed) and Windows x64 (unsigned) at the same time. Each platform publishes to the release when its build is done, so the Mac does not wait for Windows.
14
14
- The release carries `nightly-mac.yml` and `nightly.yml` for electron-updater. Until the Windows build adds `nightly.yml`, Windows apps find no update in the new release.
15
-
- If a syncor a release fails, its `notify_agent` job runs `scripts/fork-notify-agent.sh`. The script posts the run to `T3_AGENT_WEBHOOK_URL`, a webhook scheduled task on a T3 server that starts a repair agent. A manual run with `notify_agent=false` does not post. A failure right after a failure of the same workflow does not post either, because the agent that the first failure started watches the next run.
15
+
- If a sync, a release or a Fork CI run fails, its `notify_agent` job runs `scripts/fork-notify-agent.sh`. The script posts the run to `T3_AGENT_WEBHOOK_URL`, a webhook scheduled task on a T3 server that starts a repair agent. A manual run with `notify_agent=false` does not post. A failure right after a failure of the same workflow does not post either, because the agent that the first failure started watches the next run.
16
16
-`.github/workflows/fork-ci.yml` runs the `ci.yml` commands on GitHub-hosted runners for each push to main. `ci.yml` needs upstream's Blacksmith runners, so it is disabled on the fork.
17
17
- To see all fork changes, run `git diff upstream/main...main`.
18
18
- The top of `README.md` lists the fork features and fixes, up to the first `---` line. A pull request that adds, removes or changes a fork feature or fix updates its line in that list.
19
19
- If a Fork Sync merge conflicts in `README.md`, keep the fork section on top and take the upstream text below the `---` line.
20
+
- A merge without conflicts can still break a fork feature. Each fork feature that changes upstream behaviour needs a test of that behaviour, so that the fork tests catch the break.
20
21
21
22
The builds use the `nightly` update channel, the app id `com.t3tools.t3code` and the data directory `~/.t3`.
22
23
They replace the upstream Nightly app and keep its data.
0 commit comments