From db41e6718371f2b791acb65bf6c6ae2a7654e838 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Fri, 20 Mar 2026 01:35:53 +0000 Subject: [PATCH 1/2] Initial plan From 54b21f04bfd27ed4eae6fcdb5af45756631b3a0f Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Fri, 20 Mar 2026 01:37:45 +0000 Subject: [PATCH 2/2] Add backport GitHub Action targeting branch_10x and branch_9x Co-authored-by: dsmiley <377295+dsmiley@users.noreply.github.com> --- .backportrc.json | 6 ++++++ .github/workflows/backport.yml | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+) create mode 100644 .backportrc.json create mode 100644 .github/workflows/backport.yml diff --git a/.backportrc.json b/.backportrc.json new file mode 100644 index 000000000000..9391c2ca9546 --- /dev/null +++ b/.backportrc.json @@ -0,0 +1,6 @@ +{ + "targetBranchChoices": ["branch_10x", "branch_9x"], + "branchLabelMapping": { + "^backport-to-(.+)$": "$1" + } +} diff --git a/.github/workflows/backport.yml b/.github/workflows/backport.yml new file mode 100644 index 000000000000..211c94144bd7 --- /dev/null +++ b/.github/workflows/backport.yml @@ -0,0 +1,32 @@ +# This workflow automatically backports merged PRs to maintenance branches when +# a backport label is applied (e.g. "backport-to-branch_10x" or "backport-to-branch_9x"). +# +# For more information, see https://github.com/marketplace/actions/backport-action +name: Backport PR + +on: + pull_request_target: + types: ["labeled", "closed"] + +jobs: + backport: + name: Backport PR + if: github.repository == 'apache/solr' && github.event.pull_request.merged == true && !(contains(github.event.pull_request.labels.*.name, 'backport')) + runs-on: ubuntu-latest + permissions: + contents: write + pull-requests: write + steps: + - name: Backport Action + uses: sorenlouv/backport-github-action@v11 + with: + github_token: ${{ secrets.GITHUB_TOKEN }} + auto_backport_label_prefix: backport-to- + + - name: Info log + if: ${{ success() }} + run: cat ~/.backport/backport.info.log + + - name: Debug log + if: ${{ failure() }} + run: cat ~/.backport/backport.debug.log