svn commit: r1934117 - in subversion/branches/1.15.x: . .github/workflows

Author: ivan
Date: Mon May 11 18:20:01 2026
New Revision: 1934117

Log:
On 1.15.x: Merge 1934116 from trunk:
  Use tools/dist/detect-backport-conflicts.py from trunk for Git Hub Actions
  job.
  Justification:
    We can improve detect-backport-conflicts.py in trunk without messing
    with the stable branch.
  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 18:18:07 2026	(r1934116)
+++ subversion/branches/1.15.x/.github/workflows/detect-backport-conflicts.yml	Mon May 11 18:20:01 2026	(r1934117)
@@ -41,10 +41,13 @@ jobs:
           sudo apt-get update &&
           sudo apt-get install
           subversion
-          
+
+      - name: Obtain tools/dist
+        run: svn export https://svn.apache.org/repos/asf/subversion/trunk/tools/dist tools-dist
+
       - name: Checkout backport branch
         run: svn co https://svn.apache.org/repos/asf/subversion/branches/${{ github.ref_name }} branch-wc
 
       - name: Detect conflicting backports
-        run: cd branch-wc && ./tools/dist/detect-conflicting-backports.py
+        run: cd branch-wc && ../tools-dist/detect-conflicting-backports.py