Dependency fixes for GH Actions builds

scoutapp · Oct 29, 2021 · fea537e · fea537e
1 parent 8c8bfd4
commit fea537e
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/.github/workflows/laravel.yml b/.github/workflows/laravel.yml
@@ -46,6 +46,9 @@ jobs:
         run: "composer remove --dev symfony/* laravel/* --no-update --no-interaction"
       - name: "Require framework ${{ matrix.laravel-version}}"
         run: "composer require laravel/framework:${{ matrix.laravel-version}} --no-update --no-interaction --prefer-dist --prefer-stable"
+      - name: "Require Guzzle 6 ${{ matrix.lumen-version}}"
+        if: ${{ matrix.php-version == '7.1' || matrix.php-version == '7.2' }}
+        run: "composer require --dev php-http/guzzle6-adapter --no-update --no-interaction --prefer-dist --prefer-stable"
       - name: "Composer update with new requirements"
         run: "composer update --no-interaction --prefer-dist --prefer-stable"
       - name: "Run PHPUnit (Laravel) test suite"
@@ -92,7 +95,11 @@ jobs:
       - name: "Add scout-apm-php as a repository"
         run: cd test-app && composer config repositories.scout path ../scout-apm-php
       - name: "Require scout-apm-php current checkout"
-        run: cd test-app && composer require scoutapp/scout-apm-php:*@dev composer/package-versions-deprecated
+        if: ${{ matrix.php-version != '7.1' && matrix.php-version != '7.2' }}
+        run: cd test-app && composer require scoutapp/scout-apm-php:*@dev guzzlehttp/guzzle composer/package-versions-deprecated
+      - name: "Require scout-apm-php current checkout (PHP 7.1/7.2)"
+        if: ${{ matrix.php-version == '7.1' || matrix.php-version == '7.2' }}
+        run: cd test-app && composer require scoutapp/scout-apm-php:*@dev php-http/guzzle6-adapter nyholm/psr7 composer/package-versions-deprecated
       - name: "Publish the provider"
         run: cd test-app && php artisan vendor:publish --provider="Scoutapm\Laravel\Providers\ScoutApmServiceProvider"
       - name: "Configure Scout"

diff --git a/.github/workflows/lumen.yml b/.github/workflows/lumen.yml
@@ -50,6 +50,9 @@ jobs:
         run: "composer remove --dev symfony/* laravel/* --no-update --no-interaction"
       - name: "Require framework ${{ matrix.lumen-version}}"
         run: "composer require laravel/lumen:${{ matrix.lumen-version}} --no-update --no-interaction --prefer-dist --prefer-stable"
+      - name: "Require Guzzle 6 ${{ matrix.lumen-version}}"
+        if: ${{ matrix.php-version == '7.1' || matrix.php-version == '7.2' }}
+        run: "composer require --dev php-http/guzzle6-adapter --no-update --no-interaction --prefer-dist --prefer-stable"
       - name: "Composer update with new requirements"
         run: "composer update --no-interaction --prefer-dist --prefer-stable"
       - name: "Run PHPUnit (Lumen) test suite"
@@ -98,7 +101,11 @@ jobs:
       - name: "Add scout-apm-php as a repository"
         run: cd test-app && composer config repositories.scout path ../scout-apm-php
       - name: "Require scout-apm-php current checkout"
-        run: cd test-app && composer require scoutapp/scout-apm-php:*@dev composer/package-versions-deprecated
+        if: ${{ matrix.php-version != '7.1' && matrix.php-version != '7.2' }}
+        run: cd test-app && composer require scoutapp/scout-apm-php:*@dev guzzlehttp/guzzle composer/package-versions-deprecated
+      - name: "Require scout-apm-php current checkout (PHP 7.1/7.2)"
+        if: ${{ matrix.php-version == '7.1' || matrix.php-version == '7.2' }}
+        run: cd test-app && composer require scoutapp/scout-apm-php:*@dev php-http/guzzle6-adapter nyholm/psr7 composer/package-versions-deprecated
       - name: "Configure the application"
         run: cd test-app && cp ../scout-apm-php/.github/fixtures/lumen-app.php bootstrap/app.php
       - name: "Configure Scout"