Merge pull request #192 from patinthehat/main

Minor updates and improvements
spatie · Apr 8, 2024 · 5530e06 · 5530e06
2 parents 4f37808 + a8fa946
commit 5530e06
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 172 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -1,8 +1,11 @@
 version: 2
 
 updates:
-
   - package-ecosystem: "github-actions"
     directory: "/"
     schedule:
       interval: "weekly"
+  - package-ecosystem: "composer"
+    directory: "/"
+    schedule:
+      interval: "weekly"
diff --git a/.github/workflows/dependabot-auto-merge.yml b/.github/workflows/dependabot-auto-merge.yml
@@ -13,20 +13,13 @@ jobs:
 
       - name: Dependabot metadata
         id: metadata
-        uses: dependabot/fetch-metadata@v1.6.0
+        uses: dependabot/fetch-metadata@v2.0.0
         with:
           github-token: "${{ secrets.GITHUB_TOKEN }}"
           compat-lookup: true
 
-      - 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'}}
+      - name: Auto-merge Dependabot PRs for semver-minor/patch updates
+        if: ${{steps.metadata.outputs.update-type != 'version-update:semver-major'}}
         run: gh pr merge --auto --merge "$PR_URL"
         env:
           PR_URL: ${{github.event.pull_request.html_url}}

diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
@@ -17,11 +17,10 @@ jobs:
         steps:
             - name: Checkout code
               uses: actions/checkout@v4
-
-            - name: Setup Node
-              uses: actions/setup-node@v4
+
+            - uses: oven-sh/setup-bun@v1
               with:
-                  node-version: '20'
+                bun-version: latest
 
             - name: Setup PHP
               uses: shivammathur/setup-php@v2
@@ -36,8 +35,9 @@ jobs:
                   echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
             - name: Install dependencies
               run: composer update --${{ matrix.stability }} --prefer-dist --no-interaction
-
+
+            - name: Install dependencies
+              run: bun install
+
             - name: Execute tests
-              run: |
-                  npm install
-                  vendor/bin/phpunit
+              run: vendor/bin/phpunit