svn commit: r1934116 - subversion/trunk/.github/workflows

Author: ivan
Date: Mon May 11 18:18:07 2026
New Revision: 1934116

Log:
Use tools/dist/detect-backport-conflicts.py from trunk for Git Hub Actions
job.

* .github/workflows/detect-backport-conflicts.yml:
    Obtain tools/dist from trunk instead of branch we are going to test.

Modified:
   subversion/trunk/.github/workflows/detect-backport-conflicts.yml

Modified: subversion/trunk/.github/workflows/detect-backport-conflicts.yml
==============================================================================
--- subversion/trunk/.github/workflows/detect-backport-conflicts.yml	Mon May 11 18:10:45 2026	(r1934115)
+++ subversion/trunk/.github/workflows/detect-backport-conflicts.yml	Mon May 11 18:18:07 2026	(r1934116)
@@ -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