Sync: github's main has commits of its own (teahubxyz/time) #180

Closed
opened 2026-10-19 04:04:00 +00:00 by time · 2 comments
Collaborator

sync.py pushes main from the home to github fast-forward only, and github's main has commits the home doesn't. Nothing was overwritten. Either bring those commits to the home (a branch and a PR), or replace github's history: Actions → sync → Run workflow with force.

DONE: github's main follows the home again and this sync run is green.

sync.py pushes `main` from the home to github fast-forward only, and github's `main` has commits the home doesn't. Nothing was overwritten. Either bring those commits to the home (a branch and a PR), or replace github's history: Actions → sync → Run workflow with `force`. DONE: github's `main` follows the home again and this sync run is green.
time added the needs-human label 2026-10-19 04:04:00 +00:00
Owner

Expected: github's main is the old proof-of-concept history, kept on GitHub as archive/poc-main (e85709ec), so it gets replaced once with the force input. The first forced run (1094) was refused by GitHub: the deploy key was added through gh, GitHub holds such a key to that OAuth app's scopes, and the authorization lacks workflow, so a push touching .github/workflows/ is rejected. The owner is approving the workflow scope (device flow); the key is then re-added under it and the forced sync re-run. This issue closes when GitHub main equals Teahub main.

Expected: github's `main` is the old proof-of-concept history, kept on GitHub as `archive/poc-main` (e85709ec), so it gets replaced once with the force input. The first forced run (1094) was refused by GitHub: the deploy key was added through `gh`, GitHub holds such a key to that OAuth app's scopes, and the authorization lacks `workflow`, so a push touching `.github/workflows/` is rejected. The owner is approving the `workflow` scope (device flow); the key is then re-added under it and the forced sync re-run. This issue closes when GitHub `main` equals Teahub `main`.
Owner

Settled. gh's authorization gained workflow, the deploy key was re-added under it (166898032, write, this repo only), and the forced sync (run 1098) replaced GitHub's main: out {'main': 'forced'}. GitHub main is now 745231844f, the same as Teahub main. The old history stays on GitHub as archive/poc-main (e85709ec). From here main goes out fast-forward only on every push and every 15 minutes.

Settled. `gh`'s authorization gained `workflow`, the deploy key was re-added under it (166898032, write, this repo only), and the forced sync (run 1098) replaced GitHub's `main`: `out {'main': 'forced'}`. GitHub `main` is now 745231844f64, the same as Teahub `main`. The old history stays on GitHub as `archive/poc-main` (e85709ec). From here `main` goes out fast-forward only on every push and every 15 minutes.
Sign in to join this conversation.
2 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: teahubxyz/time#180