Merge branch 'main' into dependencies

InteractionDesignFoundation · Feb 28, 2024 · 3b7848a · 3b7848a
2 parents 32ef369 + 2fcc468
commit 3b7848a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
@@ -35,10 +35,7 @@ jobs:
       - name: Install dependencies
         run: |
           composer config "http-basic.nova.laravel.com" "${{ secrets.NOVA_USERNAME }}" "${{ secrets.NOVA_4_LICENSE_KEY }}" --ansi
-          composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update
-          composer update ${{ matrix.dependency-version }} --prefer-dist --no-interaction --no-suggest --ansi
-        env:
-          COMPOSER_AUTH: ${{ secrets.COMPOSER_AUTH }}
+          composer update ${{ matrix.dependency-version }} --prefer-dist --no-interaction --ansi --with="laravel/framework:${{ matrix.laravel }}" --with="orchestra/testbench:${{ matrix.testbench }}"
 
       - name: Execute tests
         run: composer test
@@ -57,4 +54,4 @@ jobs:
           key: npm-${{ hashFiles('package.json') }}-node-20
 
       - name: Compile assets
-        run: npm install && npm run nova:install && npm run prod
+        run: npm install && npm run nova:install && npm run prod
diff --git a/renovate.json b/renovate.json
@@ -0,0 +1,6 @@
+{
+    "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+    "extends": [
+        "local>InteractionDesignFoundation/.github:renovate-config"
+    ]
+}