Merge branch '6.0' into 6

Author: github-actions[bot]

.github/workflows/ci.yml

@@ -8,4 +8,4 @@ on:
 jobs:
   ci:
     name: CI
-    uses: silverstripe/gha-ci/.github/workflows/ci.yml@v1
+    uses: silverstripe/gha-ci/.github/workflows/ci.yml@v2

.github/workflows/merge-up.yml

@@ -19,4 +19,4 @@ jobs:
       actions: write
     steps:
       - name: Merge-up
-        uses: silverstripe/gha-merge-up@v1
+        uses: silverstripe/gha-merge-up@v2