Merge pull request vyos#4254 from kumvijaya/current

T6976: mirror workflows updated to use reusable workflows
nvollmar · Dec 23, 2024 · b05cbfa · b05cbfa
2 parents 6f6aa04 + cd10c81
commit b05cbfa
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 52 deletions.
diff --git a/.github/workflows/cleanup-mirror-pr-branch.yml b/.github/workflows/cleanup-mirror-pr-branch.yml
@@ -5,31 +5,11 @@ on:
     types: [closed]
     branches:
         - current
-  workflow_dispatch:
-    inputs:
-      branch:
-        description: 'Branch to delete'
-        required: true
 
 permissions:
   contents: write
 
 jobs:
-  delete_branch:
-    if: ${{ (github.event_name == 'workflow_dispatch' || startsWith(github.event.pull_request.head.ref, 'mirror/')) && github.repository_owner != 'vyos' }}
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-
-      - name: Delete branch
-        run: |
-          branch=${{ github.event_name == 'workflow_dispatch' && github.event.inputs.branch || github.event.pull_request.head.ref }}
-          if [[ $branch != mirror/* ]]; then
-            echo "Branch name to clean must start with 'mirror/'"
-            exit 1
-          fi
-          repo=${{ github.repository }}
-          git remote set-url origin https://x-access-token:${{ secrets.GITHUB_TOKEN }}@github.com/${{ github.repository }}
-          git push origin --delete $branch
+  call-delete-branch:
+    uses: vyos/.github/.github/workflows/cleanup-mirror-pr-branch.yml@current
+    secrets: inherit
diff --git a/.github/workflows/trigger-pr-mirror-repo-sync.yml b/.github/workflows/trigger-pr-mirror-repo-sync.yml
@@ -6,33 +6,7 @@ on:
       branches:
         - current
 
-env:
-  GH_TOKEN: ${{ secrets.PAT }}
-
-concurrency:
-  group: trigger-pr-mirror-repo-sync-${{ github.event.pull_request.base.ref }}
-  cancel-in-progress: false
 jobs:
-  trigger-mirror-pr-repo-sync:
-    if: ${{ github.repository_owner == 'vyos' }}
-    runs-on: ubuntu-latest
-    permissions:
-      pull-requests: write
-      contents: write
-
-    steps:
-    - name: Bullfrog Secure Runner
-      uses: bullfrogsec/bullfrog@v0
-      with:
-        egress-policy: audit
-
-    - name: Trigger repo sync
-      shell: bash
-      run: |
-        echo "Triggering sync workflow for ${{ secrets.REMOTE_OWNER }}/${{ secrets.REMOTE_REPO }}"
-        echo "Triggering sync workflow with PAT ${{ secrets.PAT }}"
-        curl -X POST \
-          -H "Accept: application/vnd.github.everest-preview+json" \
-          -H "Authorization: Bearer ${{ secrets.PAT }}" \
-          https://api.github.com/repos/${{ secrets.REMOTE_OWNER }}/${{ secrets.REMOTE_REPO }}/actions/workflows/mirror-pr-and-sync.yml/dispatches \
-          -d '{"ref":"git-actions", "inputs": {"pr_number": "${{  github.event.pull_request.number }}", "sync_branch": "${{ github.event.pull_request.base.ref }}"}}'
+  call-trigger-mirror-pr-repo-sync:
+    uses: vyos/.github/.github/workflows/trigger-pr-mirror-repo-sync.yml@current
+    secrets: inherit