From f8d3ca8a5c60a196d94727ff50d3a35778f27b01 Mon Sep 17 00:00:00 2001 From: Seungpyo1007 Date: Thu, 6 Aug 2026 11:13:12 +0900 Subject: [PATCH] fix(ci): push the verification status refresh to TechAPI develop MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The job checks out TechAPI's default branch — develop since the git-flow switch — commits the refreshed status.json there, then pushed HEAD:main. main has not moved since, so the push is rejected as non-fast-forward and every run fails after doing all the work: status.json on develop is stale since 2026-07-31. Push to develop, pin the checkout ref so it cannot drift from the push target again, and rebase first since several bots write to develop and a status refresh is not worth failing over a race. (bump-techapi.yml's HEAD:main is correct — that one pushes to TechEngine's own main, which has no develop.) Refs #1 --- .github/workflows/verify-status.yml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/.github/workflows/verify-status.yml b/.github/workflows/verify-status.yml index 7f01216..966e9e2 100644 --- a/.github/workflows/verify-status.yml +++ b/.github/workflows/verify-status.yml @@ -3,7 +3,7 @@ name: verify-status # Keep TechAPI's data/_verify/status.json (the verification-state aggregate: how # many records are verified + Tier 0 bands per category) current. Runs in # TechEngine against a TechAPI checkout and commits the refreshed file back to -# TechAPI main as TechEngineBot. Fires when TechAPI main changes (relayed by +# TechAPI develop as TechEngineBot. Fires when TechAPI main changes (relayed by # TechAPI's notify-engine -> techapi-updated) and daily as a backstop. The # "commit only if changed" guard means the status commit can't loop. on: @@ -35,6 +35,9 @@ jobs: with: repository: GetTechAPI/TechAPI path: TechAPI + # TechAPI follows git-flow. This already resolved to develop as the + # default branch — pin it so it cannot drift from the push target. + ref: develop token: ${{ secrets.TECHENGINEBOT_TOKEN || secrets.TECHAPI_TOKEN || secrets.GITHUB_TOKEN }} - uses: actions/setup-python@v6 @@ -57,4 +60,7 @@ jobs: git config user.name "TechEngineBot" git config user.email "289859915+TechEngineBot@users.noreply.github.com" git commit -m "chore(verify): refresh verification status aggregate" - git push origin HEAD:main + # Rebase first: several bots write to develop, and a status refresh is + # never worth failing the run over a race. + git pull --rebase origin develop + git push origin HEAD:develop