Merge pull request #1937 from vyos/yuriy/preflight-rename-rolling

ci: defensive triggers ahead of current→rolling default-branch rename

3 files changed, 8 insertions, 5 deletions

diff --git a/.github/workflows/check-open-prs-conflict.yml b/.github/workflows/check-open-prs-conflict.yml
index 52b11938..3aa9ce05 100644
--- a/.github/workflows/check-open-prs-conflict.yml
+++ b/.github/workflows/check-open-prs-conflict.yml
@@ -3,6 +3,7 @@ on:
   push:
     branches:
       - current
+      - rolling
       - sagitta
       - circinus
   workflow_dispatch:
diff --git a/.github/workflows/pr-mirror-repo-sync.yml b/.github/workflows/pr-mirror-repo-sync.yml
index dca33b4c..1f01bd02 100644
--- a/.github/workflows/pr-mirror-repo-sync.yml
+++ b/.github/workflows/pr-mirror-repo-sync.yml
@@ -3,7 +3,7 @@ name: PR Mirror and Repo Sync
 on:

   pull_request_target:

     types: [closed]

-    branches: [current]

+    branches: [current, rolling]

   workflow_dispatch:

     inputs:

       sync_branch:

@@ -13,6 +13,7 @@ on:
         type: choice

         options:

           - current

+          - rolling

 

 permissions:

   pull-requests: write

@@ -27,9 +28,9 @@ jobs:
         github.event_name == 'workflow_dispatch' ||

         (github.event_name == 'pull_request_target' && github.event.pull_request.merged == true)

       )

-    uses: vyos/.github/.github/workflows/pr-mirror-repo-sync.yml@current

-    with:

-      sync_branch: ${{ github.event.inputs.sync_branch || 'current' }}

+    uses: vyos/.github/.github/workflows/pr-mirror-repo-sync.yml@current
+    with:
+      sync_branch: ${{ github.event_name == 'pull_request_target' && github.event.pull_request.base.ref || github.event.inputs.sync_branch || 'current' }}
     secrets:

       PAT: ${{ secrets.PAT }}

       REMOTE_OWNER: ${{ secrets.REMOTE_OWNER }}

diff --git a/.github/workflows/update-version-tags.yml b/.github/workflows/update-version-tags.yml
index eb87f801..c7c372a3 100644
--- a/.github/workflows/update-version-tags.yml
+++ b/.github/workflows/update-version-tags.yml
@@ -4,6 +4,7 @@ on:
   push:
     branches:
       - current
+      - rolling
       - circinus
       - sagitta
 
@@ -27,7 +28,7 @@ jobs:
         run: |
           set -euo pipefail
           case "$BRANCH" in
-            current)  TAG=rolling ;;
+            current|rolling) TAG=rolling ;;
             circinus) TAG=1.5 ;;
             sagitta)  TAG=1.4 ;;
             *) echo "Unexpected branch: $BRANCH" >&2; exit 1 ;;