Merge pull request #1798 from spatie/chore/ci-updates

Chore/ci updates
spatie · Jun 7, 2024 · d01bf33 · d01bf33
2 parents 77d5b17 + 58b4352
commit d01bf33
Show file tree

Hide file tree

Showing 5 changed files with 115 additions and 93 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -1,6 +1,19 @@
+# Please see the documentation for all configuration options:
+# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
 version: 2
 updates:
-- package-ecosystem: "github-actions"
-  directory: "/"
-  schedule:
-      interval: "monthly"
+
+    - package-ecosystem: "github-actions"
+      directory: "/"
+      schedule:
+          interval: "monthly"
+      labels:
+          - "dependencies"
+
+    - package-ecosystem: "composer"
+      directory: "/"
+      schedule:
+          interval: "monthly"
+      labels:
+          - "dependencies"
diff --git a/.github/workflows/dependabot-auto-merge.yml b/.github/workflows/dependabot-auto-merge.yml
@@ -2,39 +2,32 @@ name: dependabot-auto-merge
 on: pull_request_target
 
 permissions:
-  pull-requests: write
-  contents: write
+    pull-requests: write
+    contents: write
 
 jobs:
-  dependabot:
-    runs-on: ubuntu-latest
-    if: ${{ github.actor == 'dependabot[bot]' }}
-    steps:
+    dependabot:
+        runs-on: ubuntu-latest
+        timeout-minutes: 5
+        if: ${{ github.actor == 'dependabot[bot]' }}
+        steps:
 
-      - name: Dependabot metadata
-        id: metadata
-        uses: dependabot/[email protected]
-        with:
-          github-token: "${{ secrets.GITHUB_TOKEN }}"
-          compat-lookup: true
+            - name: Dependabot metadata
+              id: metadata
+              uses: dependabot/[email protected]
+              with:
+                  github-token: "${{ secrets.GITHUB_TOKEN }}"
 
-      - name: Auto-merge Dependabot PRs for semver-minor updates
-        if: ${{steps.metadata.outputs.update-type == 'version-update:semver-minor'}}
-        run: gh pr merge --auto --merge "$PR_URL"
-        env:
-          PR_URL: ${{github.event.pull_request.html_url}}
-          GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
+            - name: Auto-merge Dependabot PRs for semver-minor updates
+              if: ${{steps.metadata.outputs.update-type == 'version-update:semver-minor'}}
+              run: gh pr merge --auto --merge "$PR_URL"
+              env:
+                  PR_URL: ${{github.event.pull_request.html_url}}
+                  GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
 
-      - name: Auto-merge Dependabot PRs for semver-patch updates
-        if: ${{steps.metadata.outputs.update-type == 'version-update:semver-patch'}}
-        run: gh pr merge --auto --merge "$PR_URL"
-        env:
-          PR_URL: ${{github.event.pull_request.html_url}}
-          GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
-
-      - name: Auto-merge Dependabot PRs for Action major versions when compatibility is higher than 90%
-        if: ${{steps.metadata.outputs.package-ecosystem == 'github_actions' && steps.metadata.outputs.update-type == 'version-update:semver-major' && steps.metadata.outputs.compatibility-score >= 90}}
-        run: gh pr merge --auto --merge "$PR_URL"
-        env:
-          PR_URL: ${{github.event.pull_request.html_url}}
-          GH_TOKEN: ${{secrets.GITHUB_TOKEN}}
+            - name: Auto-merge Dependabot PRs for semver-patch updates
+              if: ${{steps.metadata.outputs.update-type == 'version-update:semver-patch'}}
+              run: gh pr merge --auto --merge "$PR_URL"
+              env:
+                  PR_URL: ${{github.event.pull_request.html_url}}
+                  GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
diff --git a/.github/workflows/php-cs-fixer.yml b/.github/workflows/php-cs-fixer.yml
@@ -1,29 +1,28 @@
 name: Check & fix styling
 
-on: [push]
+on:
+    push:
+        paths:
+            - '**.php'
+
+permissions:
+    contents: write
 
 jobs:
-    style:
+    php-code-styling:
         runs-on: ubuntu-latest
+        timeout-minutes: 5
 
         steps:
-            -   name: Checkout code
-                uses: actions/checkout@v4
-
-            -   name: Fix style
-                uses: docker://oskarstark/php-cs-fixer-ga
-                with:
-                    args: --config=.php_cs.dist.php --allow-risky=yes
+            - name: Checkout code
+              uses: actions/checkout@v4
+              with:
+                  ref: ${{ github.head_ref }}
 
-            -   name: Extract branch name
-                shell: bash
-                run: echo "##[set-output name=branch;]$(echo ${GITHUB_REF#refs/heads/})"
-                id: extract_branch
+            - name: Fix PHP code style issues
+              uses: aglipanci/[email protected]
 
-            -   name: Commit changes
-                uses: stefanzweifel/[email protected]
-                with:
-                    commit_message: Fix styling
-                    branch: ${{ steps.extract_branch.outputs.branch }}
-                env:
-                    GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+            - name: Commit changes
+              uses: stefanzweifel/git-auto-commit-action@v5
+              with:
+                  commit_message: Fix styling
diff --git a/.github/workflows/phpstan.yml b/.github/workflows/phpstan.yml
@@ -5,11 +5,13 @@ on:
         paths:
             - '**.php'
             - 'phpstan.neon.dist'
+            - '.github/workflows/phpstan.yml'
 
 jobs:
     phpstan:
         name: phpstan
         runs-on: ubuntu-latest
+        timeout-minutes: 5
         steps:
             - uses: actions/checkout@v4
 

diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
@@ -1,53 +1,68 @@
 name: run-tests
 
-on: [push, pull_request]
+on:
+    push:
+        paths:
+            - '**.php'
+            - '.github/workflows/run-tests.yml'
+            - 'phpunit.xml.dist'
+            - 'composer.json'
+            - 'composer.lock'
 
 jobs:
-    tests:
+    test:
         runs-on: ${{ matrix.os }}
+        timeout-minutes: 5
         strategy:
             fail-fast: false
             matrix:
                 os: [ubuntu-latest]
                 php: [8.3, 8.2, 8.1]
-                laravel: [10.*, 11.*]
-                dependency-version: [prefer-stable]
+                laravel: [11.*, 10.*]
+                stability: [prefer-lowest, prefer-stable]
+                carbon: [^2.63]
                 include:
-                    -   laravel: 10.*
-                        testbench: 8.*
-                    -   laravel: 11.*
-                        testbench: 9.*
+                    - laravel: 10.*
+                      testbench: 8.*
+                    - laravel: 11.*
+                      testbench: 9.*
                 exclude:
-                    -   laravel: 11.*
-                        php: 8.1
+                    - laravel: 11.*
+                      php: 8.1
 
-        name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.dependency-version }}
+        name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }}
 
         steps:
-            -   name: Checkout code
-                uses: actions/checkout@v4
-
-            -   name: Install SQLite 3
-                run: |
-                    sudo apt-get update
-                    sudo apt-get install sqlite3
-
-            -   name: Setup PHP
-                uses: shivammathur/setup-php@v2
-                with:
-                    php-version: ${{ matrix.php }}
-                    extensions: curl, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, iconv
-                    coverage: none
-
-            -   name: Install dependencies
-                run: |
-                    composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" "nesbot/carbon:>=2.62.1" --no-interaction --no-update
-                    composer update --${{ matrix.dependency-version }} --prefer-dist --no-interaction
-
-            -   name: Setup Problem Matches
-                run: |
-                    echo "::add-matcher::${{ runner.tool_cache }}/php.json"
-                    echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
-
-            -   name: Execute tests
-                run: vendor/bin/pest
+            - name: Checkout code
+              uses: actions/checkout@v4
+
+            - name: Install SQLite 3
+              run: |
+                sudo apt-get update
+                sudo apt-get install sqlite3
+
+            - name: Setup PHP
+              uses: shivammathur/setup-php@v2
+              with:
+                php-version: ${{ matrix.php }}
+                extensions: curl, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, iconv
+                coverage: none
+
+            - name: Setup problem matchers
+              run: |
+                  echo "::add-matcher::${{ runner.tool_cache }}/php.json"
+                  echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
+
+            - name: Install dependencies
+              run: |
+                  composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" "nesbot/carbon:${{ matrix.os == 'windows-latest' && '^^^' || '' }}${{ matrix.carbon }}" --no-interaction --no-update
+                  composer update --${{ matrix.stability }} --prefer-dist --no-interaction
+
+            - name: List Installed Dependencies
+              run: composer show -D
+
+            - name: Execute tests
+              run: vendor/bin/pest --ci
+
+
+