Merge branch '1.14' into 1

silverstripe · Aug 25, 2024 · 2636502 · 2636502
2 parents 364a538 + b0f4b9d
commit 2636502
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -534,7 +534,7 @@ jobs:
             # Required for any module/recipe that runs silverstripe/assets unit tests
             # Should technically be defined as composer_require_extra on individual modules, though easier just doing here
             # 1.6.10 is for --prefer-lowest and is the minimum version with php 8.1 support
-            composer require mikey179/vfsstream:^1.6.10 --dev --no-update
+            composer require mikey179/vfsstream:^1.6.11 --dev --no-update
 
             if [[ "${{ matrix.db }}" == "pgsql" ]] && ! [[ $GITHUB_REPOSITORY =~ /silverstripe-postgresql$ ]]; then
               composer require "silverstripe/postgresql:^2 || ^3" --no-update

diff --git a/.github/workflows/tag-patch-release.yml b/.github/workflows/tag-patch-release.yml
@@ -18,6 +18,7 @@ jobs:
     if: (github.event_name == 'schedule' && github.repository_owner == 'silverstripe') || (github.event_name != 'schedule')
     runs-on: ubuntu-latest
     permissions:
+      actions: write
       contents: write
     steps:
       - name: Tag release