diff --git a/.github/workflows/create-security-branch.yml b/.github/workflows/create-security-branch.yml index 756662bf742..d3df287bb41 100644 --- a/.github/workflows/create-security-branch.yml +++ b/.github/workflows/create-security-branch.yml @@ -10,6 +10,10 @@ on: type: string description: 'The security branch number (e.g., 01)' required: true + repository: + type: string + description: 'The repository to create the security branch in (e.g., grafana/grafana-security-mirror)' + required: true outputs: branch: description: The new security branch that was created @@ -44,7 +48,7 @@ jobs: uses: actions/checkout@v4 with: token: ${{ steps.generate_token.outputs.token }} - repository: grafana/grafana-security-mirror + repository: ${{ inputs.repository }} fetch-depth: 0 - name: Configure git diff --git a/.github/workflows/release-comms.yml b/.github/workflows/release-comms.yml index 307ec138503..1cc5744aca1 100644 --- a/.github/workflows/release-comms.yml +++ b/.github/workflows/release-comms.yml @@ -77,13 +77,22 @@ jobs: with: ownerRepo: 'grafana/grafana-enterprise' source: ${{ needs.setup.outputs.release_branch }} - create_security_branch: - name: Create security branch + create_security_branch_grafana: + name: Create security branch (Grafana) needs: setup uses: ./.github/workflows/create-security-branch.yml with: version: ${{ needs.setup.outputs.version }} security_branch_number: "01" + repository: grafana/grafana-security-mirror + create_security_branch_enterprise: + name: Create security branch (Enterprise) + needs: setup + uses: ./.github/workflows/create-security-branch.yml + with: + version: ${{ needs.setup.outputs.version }} + security_branch_number: "01" + repository: grafana/grafana-enterprise-security-mirror migrate_prs_grafana: needs: - setup