From 7b88bf12e4da6dd16d68a71cbb0fc796c8419563 Mon Sep 17 00:00:00 2001 From: Vitor Bandeira Date: Thu, 27 Aug 2026 10:54:27 -0300 Subject: [PATCH] Fix quarterly tag drift between fork and upstream The quarterly tag workflow ran on both the fork and upstream. Each side made its own annotated tag object for the same commit. The two tag objects did not match, so a plain `git fetch` between the fork and upstream failed on the tag. Now the tag workflow runs only on the upstream repo. The fork sync workflow copies the exact tag object from upstream instead. Signed-off-by: Vitor Bandeira --- .../github-actions-cron-sync-fork-from-upstream.yml | 6 ++++++ .github/workflows/github-actions-quarterly-tag.yml | 1 + 2 files changed, 7 insertions(+) diff --git a/.github/workflows/github-actions-cron-sync-fork-from-upstream.yml b/.github/workflows/github-actions-cron-sync-fork-from-upstream.yml index e91e0633cc..2c62d06a12 100644 --- a/.github/workflows/github-actions-cron-sync-fork-from-upstream.yml +++ b/.github/workflows/github-actions-cron-sync-fork-from-upstream.yml @@ -41,4 +41,10 @@ jobs: # You can also manually trigger a workflow dispatch with the force # value equal to 'true'. force: ${{ github.event.inputs.force || (secrets.UPSTREAM_SYNC == 'always overwrite master branch') }} + # Quarterly release tags are only created upstream (see + # github-actions-quarterly-tag.yml); mirror the exact tag object + # here instead of letting this repo mint its own, which is what + # caused tag drift (same commit, two different annotated tag + # objects, breaking plain `git fetch` between the two remotes). + syncTags: true deployKey: ${{ secrets.DEPLOY_KEY }} diff --git a/.github/workflows/github-actions-quarterly-tag.yml b/.github/workflows/github-actions-quarterly-tag.yml index a41bc979b3..706412689c 100644 --- a/.github/workflows/github-actions-quarterly-tag.yml +++ b/.github/workflows/github-actions-quarterly-tag.yml @@ -14,6 +14,7 @@ jobs: create-tag: name: Create quarterly tag runs-on: ubuntu-latest + if: github.repository == 'The-OpenROAD-Project/OpenROAD-flow-scripts' permissions: contents: write steps: