Merge branch 'master' into creame

creame · Mar 14, 2024 · 9ca24f7 · 9ca24f7
2 parents affd849 + 8b72926
commit 9ca24f7
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 21 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -10,7 +10,7 @@ jobs:
         php-version: ['8.0', '8.1', '8.2']
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
 
     - name: Setup PHP
       uses: shivammathur/setup-php@v2
@@ -19,9 +19,9 @@ jobs:
 
     - name: Cache Composer dependencies
       id: composer-cache
-      run: echo "::set-output name=dir::$(composer config cache-files-dir)"
+      run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
 
-    - uses: actions/cache@v2
+    - uses: actions/cache@v4
       with:
         path: ${{ steps.composer-cache.outputs.dir }}
         key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}

diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
@@ -6,12 +6,12 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
       with:
         repository: roots/bedrock-docker
         ref: main
         path: bedrock-docker
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
       with:
         path: bedrock-docker/bedrock
     - name: Build and run

diff --git a/composer.lock b/composer.lock