From fea537e704d5471b3785edc06e8fdb04e3180f02 Mon Sep 17 00:00:00 2001 From: James Titcumb Date: Fri, 29 Oct 2021 12:31:50 +0100 Subject: [PATCH] Dependency fixes for GH Actions builds --- .github/workflows/laravel.yml | 9 ++++++++- .github/workflows/lumen.yml | 9 ++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/.github/workflows/laravel.yml b/.github/workflows/laravel.yml index 232b85e2..3b75cb1e 100644 --- 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 index 5aa9dbf1..a27b0257 100644 --- 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"