Merge branch 'master' into aoptk

Author: hechth

.github/workflows/ci.yaml

@@ -8,7 +8,7 @@ on:
     types: [run-all-tool-tests-command]
 env:
   GALAXY_FORK: galaxyproject
-  GALAXY_BRANCH: release_24.2
+  GALAXY_BRANCH: release_25.1
   MAX_CHUNKS: 40
 jobs:
   setup:

.github/workflows/pr.yaml

@@ -18,7 +18,7 @@ on:
       - '*'
 env:
   GALAXY_FORK: galaxyproject
-  GALAXY_BRANCH: release_24.2
+  GALAXY_BRANCH: release_25.1
   MAX_CHUNKS: 4
   MAX_FILE_SIZE: 1M
 concurrency: