From 8d883ecda146392c4a6d3eb5e462eef7dbb66810 Mon Sep 17 00:00:00 2001 From: Kevin Minehart <5140827+kminehart@users.noreply.github.com> Date: Thu, 17 Apr 2025 17:13:06 -0500 Subject: [PATCH] CI: remove old patch checks (#104184) * remove old patch checks * remove from CODEOWNERS * rerun CI --- .github/CODEOWNERS | 2 -- .github/workflows/pr-patch-check.yml | 27 --------------------------- .github/workflows/sync-mirror.yml | 25 ------------------------- 3 files changed, 54 deletions(-) delete mode 100644 .github/workflows/pr-patch-check.yml delete mode 100644 .github/workflows/sync-mirror.yml diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 963e31af5d7..59e6164cb87 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -789,11 +789,9 @@ embed.go @grafana/grafana-as-code /.github/workflows/pr-codeql-analysis-javascript.yml @DanCech /.github/workflows/pr-codeql-analysis-python.yml @DanCech /.github/workflows/pr-commands.yml @tolzhabayev -/.github/workflows/pr-patch-check.yml @grafana/grafana-developer-enablement-squad /.github/workflows/pr-patch-check-event.yml @grafana/grafana-developer-enablement-squad /.github/workflows/pr-test-integration.yml @grafana/grafana-backend-group /.github/workflows/pr-backend-coverage.yml @grafana/grafana-backend-group -/.github/workflows/sync-mirror.yml @grafana/grafana-developer-enablement-squad /.github/workflows/sync-mirror-event.yml @grafana/grafana-developer-enablement-squad /.github/workflows/publish-technical-documentation-next.yml @grafana/docs-tooling /.github/workflows/publish-technical-documentation-release.yml @grafana/docs-tooling diff --git a/.github/workflows/pr-patch-check.yml b/.github/workflows/pr-patch-check.yml deleted file mode 100644 index ef1009b7545..00000000000 --- a/.github/workflows/pr-patch-check.yml +++ /dev/null @@ -1,27 +0,0 @@ -# Owned by grafana-release-guild -# 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: - types: - - opened - - reopened - - synchronize - branches: - - "main" - - "v*.*.*" - - "release-*" - -# Since this is run on a pull request, we want to apply the patches intended for the -# target branch onto the source branch, to verify compatibility before merging. -jobs: - trigger_downstream_patch_check: - uses: grafana/security-patch-actions/.github/workflows/test-patches.yml@main - if: github.repository == 'grafana/grafana' - with: - src_repo: "${{ github.repository }}" - src_ref: "${{ github.head_ref }}" # this is the source branch name, Ex: "feature/newthing" - patch_repo: "${{ github.repository }}-security-patches" - patch_ref: "${{ github.base_ref }}" # this is the target branch name, Ex: "main" - secrets: inherit diff --git a/.github/workflows/sync-mirror.yml b/.github/workflows/sync-mirror.yml deleted file mode 100644 index 09c8f87d509..00000000000 --- a/.github/workflows/sync-mirror.yml +++ /dev/null @@ -1,25 +0,0 @@ -# Owned by grafana-release-guild -# Intended to be dropped into the base repo, Ex: grafana/grafana -name: Sync to mirror -run-name: sync-to-mirror-${{ github.ref_name }} -on: - workflow_dispatch: - push: - branches: - - "main" - - "v*.*.*" - - "release-*" - -# This is run after the pull request has been merged, so we'll run against the target branch -jobs: - trigger_downstream_patch_mirror: - concurrency: patch-mirror-${{ github.ref_name }} - uses: grafana/security-patch-actions/.github/workflows/mirror-branch-and-apply-patches.yml@main - if: github.repository == 'grafana/grafana' - with: - 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" - secrets: inherit -