Author: ivan
Date: Mon May 11 14:37:12 2026
New Revision: 1934100
Log:
On 1.15.x: Merge r1934091, r1934092, r1934095, r1934096 from trunk:
Make backportbot GHA to run on 1.15.x branch.
Justification:
Keep GHA configuration in sync with trunk.
Votes:
+1: ivan (only affects GHA)
Modified:
subversion/branches/1.15.x/ (props changed)
subversion/branches/1.15.x/.github/workflows/detect-backport-conflicts.yml
Modified:
subversion/branches/1.15.x/.github/workflows/detect-backport-conflicts.yml
==============================================================================
--- subversion/branches/1.15.x/.github/workflows/detect-backport-conflicts.yml
Mon May 11 13:32:46 2026 (r1934099)
+++ subversion/branches/1.15.x/.github/workflows/detect-backport-conflicts.yml
Mon May 11 14:37:12 2026 (r1934100)
@@ -24,9 +24,7 @@ name: backportbot
on:
push:
- branches: ["1.14.x"]
- pull_request:
- branches: ["1.14.x"]
+ branches: ["1.14.x", "1.15.x"]
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
@@ -45,8 +43,8 @@ jobs:
subversion
- name: Checkout backport branch
- run: svn co https://svn.apache.org/repos/asf/subversion/branches/1.14.x
+ run: svn co https://svn.apache.org/repos/asf/subversion/branches/${{
github.ref_name }} branch-wc
- name: Detect conflicting backports
- run: cd 1.14.x && ./tools/dist/detect-conflicting-backports.py
+ run: cd branch-wc && ./tools/dist/detect-conflicting-backports.py
