From ce868361d6582017ecf7b44fdbcbb1caacdcd729 Mon Sep 17 00:00:00 2001
From: Marco Nenciarini <marco.nenciarini@enterprisedb.com>
Date: Fri, 19 Jun 2026 17:50:33 +0200
Subject: [PATCH] ci: tag the synced commit on release

The cloudnative-pg release-tag workflow now passes the release tag in
the sync-api dispatch payload. Tag the freshly synced commit so the API
repository keeps the same tags as cloudnative-pg, removing the manual
tagging step.

A release also triggers a second, tag-less sync from the push to main, so
serialize the workflow with a concurrency group to avoid racing on the
commit to main.

Closes cloudnative-pg/cloudnative-pg#10963

Assisted-by: Claude
Signed-off-by: Marco Nenciarini <marco.nenciarini@enterprisedb.com>
---
 .github/workflows/sync.yaml | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/.github/workflows/sync.yaml b/.github/workflows/sync.yaml
index 98189ce..f31c3ba 100644
--- a/.github/workflows/sync.yaml
+++ b/.github/workflows/sync.yaml
@@ -12,6 +12,13 @@ on:
 
 permissions: read-all
 
+# A release dispatches a tag-carrying sync while the push to main triggers a
+# second, tag-less sync. Serialize them so they don't race on the commit to main
+# and the tag-carrying run tags the already-synced commit.
+concurrency:
+  group: sync-api
+  cancel-in-progress: false
+
 jobs:
   sync:
     runs-on: ubuntu-latest
@@ -73,3 +80,18 @@ jobs:
           access_token: ${{ secrets.REPO_PAT }}
           branch: main
           enforce_admins: ${{ steps.disable_include_admins.outputs.initial_status }}
+
+      # When the sync is triggered by a release, the cloudnative-pg release-tag
+      # workflow passes the release tag in the dispatch payload. Tag the freshly
+      # synced commit so the API repository keeps the same tags as cloudnative-pg.
+      - name: Tag the synced release
+        if: ${{ github.event_name == 'repository_dispatch' && github.event.client_payload.tag != '' }}
+        env:
+          TAG: ${{ github.event.client_payload.tag }}
+        run: |
+          if git ls-remote --tags origin "refs/tags/${TAG}" | grep -q .; then
+            echo "Tag ${TAG} already exists, nothing to do."
+            exit 0
+          fi
+          git tag "${TAG}"
+          git push origin "${TAG}"