T7644: mirror workflow refactoring rollout

4 files changed, 35 insertions, 55 deletions

diff --git a/.github/workflows/cleanup-mirror-pr-branch.yml b/.github/workflows/cleanup-mirror-pr-branch.yml
deleted file mode 100644
index a62e44b..0000000
--- a/.github/workflows/cleanup-mirror-pr-branch.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-name: Cleanup pr mirror branch
-
-on:
-  pull_request:
-    types: [closed]
-    branches:
-        - current
-
-permissions:
-  contents: write
-
-jobs:
-  call-delete-branch:
-    if: github.repository_owner != 'vyos'
-    uses: vyos/.github/.github/workflows/cleanup-mirror-pr-branch.yml@current
-    secrets: inherit
diff --git a/.github/workflows/mirror-pr-and-sync.yml b/.github/workflows/mirror-pr-and-sync.yml
deleted file mode 100644
index 120e116..0000000
--- a/.github/workflows/mirror-pr-and-sync.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-name: Create Mirror PR and Repo Sync
-on:
-  workflow_dispatch:
-    inputs:
-      sync_branch:
-        description: 'branch to sync'
-        required: true
-        type: string
-
-permissions:
-  pull-requests: write
-  contents: write
-
-jobs:
-  call-mirror-pr-and-sync:
-    if: github.repository_owner != 'vyos'
-    uses: VyOS-Networks/vyos-reusable-workflows/.github/workflows/mirror-pr-and-sync.yml@main
-    with:
-      sync_branch: ${{ inputs.sync_branch }}
-    secrets:
-      PAT: ${{ secrets.PAT }}
diff --git a/.github/workflows/pr-mirror-repo-sync.yml b/.github/workflows/pr-mirror-repo-sync.yml
new file mode 100644
index 0000000..88fb563
--- /dev/null
+++ b/.github/workflows/pr-mirror-repo-sync.yml
@@ -0,0 +1,35 @@
+name: PR Mirror and Repo Sync
+
+on:
+  pull_request_target:
+    types: [closed]
+    branches: [current]
+  workflow_dispatch:
+    inputs:
+      sync_branch:
+        description: 'Branch to mirror'
+        required: true
+        default: 'current'
+        type: choice
+        options:
+          - current
+
+permissions:
+  pull-requests: write
+  contents: write
+  issues: write
+
+jobs:
+  call-pr-mirror-repo-sync:
+    if: |
+      github.repository_owner == 'vyos' &&
+      (
+        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' }}
+    secrets:
+      PAT: ${{ secrets.PAT }}
+      REMOTE_OWNER: ${{ secrets.REMOTE_OWNER }}
diff --git a/.github/workflows/trigger-pr-mirror-repo-sync.yml b/.github/workflows/trigger-pr-mirror-repo-sync.yml
deleted file mode 100644
index 978be05..0000000
--- a/.github/workflows/trigger-pr-mirror-repo-sync.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-name: Trigger Mirror PR and Repo Sync
-on:
-  pull_request_target:
-      types:
-        - closed
-      branches:
-        - current
-
-permissions:
-  pull-requests: write
-  contents: write
-  issues: write
-
-jobs:
-  call-trigger-mirror-pr-repo-sync:
-    if: github.repository_owner == 'vyos' && github.event.pull_request.merged == true
-    uses: vyos/.github/.github/workflows/trigger-pr-mirror-repo-sync.yml@current
-    secrets: inherit