Laravel 10 Support (#241)

joelbutcher · Feb 1, 2023 · 461b204 · 461b204
1 parent 108d508
commit 461b204
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 16 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -3,7 +3,7 @@ name: tests
 on:
   push:
     branches:
-      - master
+      - main
       - '*.x'
   pull_request:
   schedule:
@@ -17,13 +17,16 @@ jobs:
       fail-fast: true
       matrix:
         php: [ '8.0', 8.1, 8.2 ]
-        laravel: [ 9 ]
+        laravel: [ 9, 10 ]
+        exclude:
+          - php: '8.0'
+            laravel: 10
 
     name: PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }}
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
@@ -55,27 +58,34 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: 8.1
+          php-version: 8.2
           extensions: dom, curl, libxml, mbstring, zip
           ini-values: error_reporting=E_ALL
           tools: composer:v2
           coverage: none
 
       - name: Setup Laravel
         run: |
-          composer create-project laravel/laravel:^9 .
-          composer require joelbutcher/socialstream:^3
-          rm -rf vendor/joelbutcher/socialstream
+          composer create-project laravel/laravel:10.x-dev .
+          composer require joelbutcher/socialstream:* --no-interaction --no-update
+          composer config repositories.socialstream '{"type": "path", "url": "socialstream"}' --file composer.json
+
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
-          path: 'vendor/joelbutcher/socialstream'
+          path: 'socialstream'
 
-      - name: Install
+      - name: Install Socialstream
         run: |
-          composer dump
+          composer update "joelbutcher/jetstream" --prefer-dist --no-interaction --no-progress -W
           php artisan socialstream:install --stack=${{ matrix.stack }} --teams --api --verification
 
+      - name: Install NPM dependencies
+        run: npm i
+
+      - name: Compile assets
+        run: npm run build
+
       - name: Execute tests
         run: vendor/bin/phpunit --verbose
         env:

diff --git a/composer.json b/composer.json
@@ -30,15 +30,15 @@
     "require": {
         "php": "^8.0.2",
         "doctrine/dbal": "^3.0",
-        "illuminate/support": "^9.21",
-        "laravel/jetstream": "^2.15.0",
-        "laravel/socialite": "^5.5.1"
+        "illuminate/support": "^9.21|^10.0",
+        "laravel/jetstream": "^2.15|^2.16",
+        "laravel/socialite": "^5.5|^5.6"
     },
     "require-dev": {
         "inertiajs/inertia-laravel": "^0.6.4",
-        "laravel/sanctum": "^2.7",
+        "laravel/sanctum": "^2.7|^3.2",
         "mockery/mockery": "^1.0",
-        "orchestra/testbench": "^7.0",
+        "orchestra/testbench": "^7.0|^8.0",
         "phpunit/phpunit": "^9.3"
     },
     "autoload": {