diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index d54df222cd1..97fc1c67b7e 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -611,8 +611,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/pr-patch-mirror-and-apply.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-delivery diff --git a/.github/workflows/pr-security-patch-check.yml b/.github/workflows/pr-patch-check.yml similarity index 79% rename from .github/workflows/pr-security-patch-check.yml rename to .github/workflows/pr-patch-check.yml index ff61ed2e2a7..ed2b5634b2a 100644 --- a/.github/workflows/pr-security-patch-check.yml +++ b/.github/workflows/pr-patch-check.yml @@ -1,7 +1,7 @@ # Owned by grafana-delivery-squad -# Intended to be dropped into the base repo Ex: grafana/grafana -name: Check for security patch conflicts -run-name: check-security-patch-conflicts-${{ github.base_ref }}-${{ github.head_ref }} +# Intended to be dropped into the base repo Ex: grafana/grafana +name: Check for patch conflicts +run-name: check-patch-conflicts-${{ github.base_ref }}-${{ github.head_ref }} on: pull_request_target: types: diff --git a/.github/workflows/pr-security-patch-mirror-and-apply.yml b/.github/workflows/pr-patch-mirror-and-apply.yml similarity index 78% rename from .github/workflows/pr-security-patch-mirror-and-apply.yml rename to .github/workflows/pr-patch-mirror-and-apply.yml index 6359e4c9dce..dedf01cc754 100644 --- a/.github/workflows/pr-security-patch-mirror-and-apply.yml +++ b/.github/workflows/pr-patch-mirror-and-apply.yml @@ -1,7 +1,7 @@ # Owned by grafana-delivery-squad # Intended to be dropped into the base repo, Ex: grafana/grafana -name: Sync to security mirror -run-name: sync-to-security-mirror-${{ github.base_ref }}-${{ github.head_ref }} +name: Sync to mirror +run-name: sync-to-mirror-${{ github.base_ref }}-${{ github.head_ref }} on: pull_request_target: types: @@ -13,8 +13,8 @@ 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 }} + trigger_downstream_patch_mirror: + concurrency: patch-mirror-${{ github.ref }} if: github.event.pull_request.merged == true uses: grafana/security-patch-actions/.github/workflows/mirror-branch-and-apply-patches.yml@main with: