chore: Sync changes from the template

tenantcloud · May 14, 2024 · 42db4eb · 42db4eb
1 parent 2e0bcf1
commit 42db4eb
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 10 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -15,8 +15,7 @@ on:
 jobs:
     release:
         name: Release
-        runs-on: packages
-        container: node:22
+        runs-on: ubuntu-latest
         if: ${{ github.event.workflow_run.conclusion == 'success' }}
         steps:
             - name: Checkout

diff --git a/.github/workflows/template-sync.yml b/.github/workflows/template-sync.yml
@@ -21,11 +21,30 @@ jobs:
               with:
                   token: ${{ secrets.GITHUB_TOKEN }}
 
-            - name: Reformat
+            - name: Reformat using Prettier
               uses: actionsx/prettier@v2
               with:
                   args: --write .
 
+            - name: Setup PHP
+              uses: shivammathur/setup-php@v2
+              with:
+                  php-version: 8.2
+                  extensions: dom, libxml, mbstring
+                  tools: composer:v2
+                  coverage: none
+
+            - name: Composer cache
+              uses: actions/cache@v3
+              with:
+                  path: vendor
+                  key: composer-${{ hashFiles('composer.json') }}
+
+            - name: Reformat using php-cs-fixer
+              run: |
+                  composer install
+                  composer cs-fix
+
             - name: Generate token to read from source repo
               id: generate_token
               uses: tibdex/github-app-token@v1
@@ -52,7 +71,7 @@ jobs:
     workflow-keepalive:
         name: Workflow keepalive
         runs-on: packages
-        container: node:22
+        container: maniator/gh:v2.48.0
         if: github.event_name == 'schedule'
 
         permissions:

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -1,6 +1,15 @@
 name: Tests
 
-on: [pull_request]
+on:
+    workflow_dispatch:
+    pull_request:
+    push:
+        branches:
+            - master
+            - next
+            - next-major
+            - beta
+            - alpha
 
 jobs:
     phpunit:
@@ -20,7 +29,7 @@ jobs:
               uses: actions/cache@v3
               with:
                   path: vendor
-                  key: composer-${{ runner.os }}-${{ hashFiles('composer.json') }}
+                  key: composer-${{ hashFiles('composer.json') }}
 
             - name: Install dependencies
               run: composer install --prefer-dist --no-progress
@@ -40,7 +49,7 @@ jobs:
               uses: actions/cache@v3
               with:
                   path: vendor
-                  key: composer-${{ runner.os }}-${{ hashFiles('composer.json') }}
+                  key: composer-${{ hashFiles('composer.json') }}
 
             - name: Install dependencies
               run: composer install --prefer-dist --no-progress
@@ -79,7 +88,7 @@ jobs:
               uses: actions/cache@v3
               with:
                   path: vendor
-                  key: composer-${{ runner.os }}-${{ hashFiles('composer.json') }}
+                  key: composer-${{ hashFiles('composer.json') }}
 
             - name: Install dependencies
               run: composer install --prefer-dist --no-progress

diff --git a/composer.json b/composer.json
@@ -10,8 +10,8 @@
 	"require-dev": {
 		"pestphp/pest": "^2.8",
 		"mockery/mockery": "^1.4",
-		"php-cs-fixer/shim": "~3.19.2",
-		"tenantcloud/php-cs-fixer-rule-sets": "~3.0.0",
+		"php-cs-fixer/shim": "^3.54",
+		"tenantcloud/php-cs-fixer-rule-sets": "~3.3.0",
 		"phpstan/phpstan": "~1.10.21",
 		"phpstan/phpstan-phpunit": "^1.3",
 		"phpstan/phpstan-webmozart-assert": "^1.2",