diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 4990990821a..bd9319be27c 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -604,8 +604,8 @@ embed.go @grafana/grafana-as-code /.github/workflows/pr-codeql-analysis-python.yml @DanCech /.github/workflows/pr-commands-closed.yml @tolzhabayev /.github/workflows/pr-commands.yml @marefr -/.github/workflows/pr-security-patch-check.yml @grafana/grafana-delivery -/.github/workflows/pr-security-patch-mirror-and-apply.yml @grafana/grafana-delivery +/.github/workflows/pr-patch-check.yml @grafana/grafana-delivery +/.github/workflows/sync-mirror.yml @grafana/grafana-delivery /.github/workflows/publish-technical-documentation-next.yml @grafana/docs-grafana /.github/workflows/publish-technical-documentation-release.yml @grafana/docs-grafana /.github/workflows/remove-milestone.yml @grafana/grafana-frontend-platform diff --git a/.github/workflows/pr-security-patch-mirror-and-apply.yml b/.github/workflows/sync-mirror.yml similarity index 73% rename from .github/workflows/pr-security-patch-mirror-and-apply.yml rename to .github/workflows/sync-mirror.yml index 6359e4c9dce..c7a70c0e94a 100644 --- a/.github/workflows/pr-security-patch-mirror-and-apply.yml +++ b/.github/workflows/sync-mirror.yml @@ -3,9 +3,8 @@ name: Sync to security mirror run-name: sync-to-security-mirror-${{ github.base_ref }}-${{ github.head_ref }} on: - pull_request_target: - types: - - closed + workflow_dispatch: + push: branches: - "main" - "v*.*.*" @@ -13,12 +12,12 @@ on: # This is run after the pull request has been merged, so we'll run against the target branch jobs: - trigger_downstream_security_mirror: - concurrency: security-mirror-${{ github.ref }} - if: github.event.pull_request.merged == true + trigger_downstream_patch_mirror: + concurrency: patch-mirror-${{ github.ref }} uses: grafana/security-patch-actions/.github/workflows/mirror-branch-and-apply-patches.yml@main + if: github.repository == 'grafana/grafana' with: - ref: "${{ github.base_ref }}" # this is the target branch name, Ex: "main" + ref: "${{ github.ref_name }}" # this is the target branch name, Ex: "main" src_repo: "${{ github.repository }}" dest_repo: "${{ github.repository }}-security-mirror" patch_repo: "${{ github.repository }}-security-patches"