From c9956ffc59435b5b1f61e6ab2be6950394740aae Mon Sep 17 00:00:00 2001 From: Kevin Minehart Date: Tue, 22 Apr 2025 08:28:36 -0500 Subject: [PATCH] remove old PR patch check and sync mirror workflows --- .github/workflows/pr-patch-check.yml | 27 ---------------- .github/workflows/sync-mirror-event.yml | 43 ------------------------- 2 files changed, 70 deletions(-) delete mode 100644 .github/workflows/pr-patch-check.yml delete mode 100644 .github/workflows/sync-mirror-event.yml 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-event.yml b/.github/workflows/sync-mirror-event.yml deleted file mode 100644 index b1a1466fdf9..00000000000 --- a/.github/workflows/sync-mirror-event.yml +++ /dev/null @@ -1,43 +0,0 @@ -# Owned by grafana-delivery-squad -# Intended to be dropped into the base repo, Ex: grafana/grafana -name: Dispatch sync to mirror -run-name: dispatch-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: - dispatch-job: - runs-on: ubuntu-latest - steps: - - name: "Generate token" - id: generate_token - uses: tibdex/github-app-token@3beb63f4bd073e61482598c45c71c1019b59b73a - with: - # App needs Actions: Read/Write for the grafana/security-patch-actions repo - app_id: ${{ secrets.GRAFANA_DELIVERY_BOT_APP_ID }} - private_key: ${{ secrets.GRAFANA_DELIVERY_BOT_APP_PEM }} - - - uses: actions/github-script@v7 - if: github.repository == 'grafana/grafana' - with: - github-token: ${{ steps.generate_token.outputs.token }} - script: | - await github.rest.actions.createWorkflowDispatch({ - owner: 'grafana', - repo: 'security-patch-actions', - workflow_id: 'mirror-branch-and-apply-patches-event.yml', - ref: 'main', - inputs: { - src_ref: "${{ github.ref_name }}", - src_repo: "${{ github.repository }}", - src_sha: "${{ github.sha }}", - dest_repo: "${{ github.repository }}-security-mirror", - patch_repo: "${{ github.repository }}-security-patches" - } - })