From 55d523f0de5219211ea0b516b1e9088f44803faa Mon Sep 17 00:00:00 2001 From: Phil Sturgeon <67381+philsturgeon@users.noreply.github.com> Date: Fri, 11 Mar 2022 14:03:42 +0000 Subject: [PATCH 1/8] Bump to rollbar-php v3.1.0 for PHP 8.0 compat --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index b43adfa..d605d92 100644 --- a/composer.json +++ b/composer.json @@ -24,7 +24,7 @@ "require": { "php": ">=7.2|^8.0", "illuminate/support": "^6.0|^7.0|^8.0|^9.0", - "rollbar/rollbar": "^2" + "rollbar/rollbar": "^3.1" }, "require-dev": { "orchestra/testbench": "^4.0|^5.0|^6.0|^7.0", From 804b231a732c7fb125bd32f71f01c005f718d90f Mon Sep 17 00:00:00 2001 From: Phil Sturgeon <67381+philsturgeon@users.noreply.github.com> Date: Wed, 16 Mar 2022 10:36:48 +0000 Subject: [PATCH 2/8] chore: return support for rollbar v2 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index d605d92..600ce50 100644 --- a/composer.json +++ b/composer.json @@ -24,7 +24,7 @@ "require": { "php": ">=7.2|^8.0", "illuminate/support": "^6.0|^7.0|^8.0|^9.0", - "rollbar/rollbar": "^3.1" + "rollbar/rollbar": "^2.0 | ^3.1" }, "require-dev": { "orchestra/testbench": "^4.0|^5.0|^6.0|^7.0", From 78dd0272e4d78c1e27c29906ab3d90d1ad93dc5f Mon Sep 17 00:00:00 2001 From: tobigumo Date: Thu, 17 Mar 2022 10:13:42 +0900 Subject: [PATCH 3/8] Update ci.yml Laravel 6 and 7 requires php 7.2 - 8.0, so exclude all php versions after 8.1 --- .github/workflows/ci.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ff3e286..2caaa7c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -34,6 +34,12 @@ jobs: php: [8.1, 8.0, 7.4, 7.3, 7.2] laravel: [^9, ^8, ^7, ^6] exclude: + # Laravel 6 requires php 7.2-8.0, so exclude all php versions after 8.1 + - laravel: ^6 + php: 8.1 + # Laravel 7 requires php 7.2-8.0, so exclude all php versions after 8.1 + - laravel: ^7 + php: 8.1 # Laravel 8 requires php 7.3+, so exclude all PHP versions prior to 7.3 - laravel: ^8 php: 7.2 From 79ec1ce0187cc34379315b83978455af9daef9a9 Mon Sep 17 00:00:00 2001 From: Daniel Morell Date: Thu, 17 Mar 2022 05:46:50 -0500 Subject: [PATCH 4/8] Added `composer update` to install step --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2caaa7c..3544feb 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -72,6 +72,7 @@ jobs: run: | composer config repositories.local '{"type":"path", "url":".."}' composer require rollbar/rollbar-laravel + composer update psr/log echo "ROLLBAR_TOKEN=${ROLLBAR_TOKEN}" >> .env echo "GITHUB_RUN_ID=${GITHUB_RUN_ID}" >> .env chmod 400 .env From cdbd5f7ea4cb4626ff20d016d3c9b33d09d0c1ce Mon Sep 17 00:00:00 2001 From: Daniel Morell Date: Thu, 17 Mar 2022 06:14:17 -0500 Subject: [PATCH 5/8] Moved `composer update` to its own step --- .github/workflows/ci.yml | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3544feb..8ff2a9c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -69,10 +69,20 @@ jobs: - name: Install that code using Composer rigged to look in the parent directory working-directory: rollbar-test-app + continue-on-error: true run: | composer config repositories.local '{"type":"path", "url":".."}' composer require rollbar/rollbar-laravel - composer update psr/log + + - name: Try to resolve requirements into an installable set of packages + working-directory: rollbar-test-app + # This adds time, so only run this if the previous step fails. + if: ${{ failure() }} + run: composer update + + - name: Setup .env + working-directory: rollbar-test-app + run: | echo "ROLLBAR_TOKEN=${ROLLBAR_TOKEN}" >> .env echo "GITHUB_RUN_ID=${GITHUB_RUN_ID}" >> .env chmod 400 .env From 33da865504f24acf7734246c0ef44f02713807fe Mon Sep 17 00:00:00 2001 From: Daniel Morell Date: Thu, 17 Mar 2022 06:27:05 -0500 Subject: [PATCH 6/8] Updated `composer update` if statement This explicitly checks the previous step before `continue-on-error: true` is applied. --- .github/workflows/ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8ff2a9c..72baeee 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -68,6 +68,7 @@ jobs: run: composer create-project laravel/laravel rollbar-test-app ${{ matrix.laravel }} - name: Install that code using Composer rigged to look in the parent directory + id: composer_require working-directory: rollbar-test-app continue-on-error: true run: | @@ -77,7 +78,7 @@ jobs: - name: Try to resolve requirements into an installable set of packages working-directory: rollbar-test-app # This adds time, so only run this if the previous step fails. - if: ${{ failure() }} + if: ${{ steps.composer_require.outcome == 'failure' }} run: composer update - name: Setup .env From 15b735c19b578746aabd9711674967a364c369f8 Mon Sep 17 00:00:00 2001 From: Daniel Morell Date: Mon, 21 Mar 2022 10:38:20 -0500 Subject: [PATCH 7/8] Excluded IDE files --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index 4b53aba..fffcfcd 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,6 @@ /vendor composer.lock .DS_Store +.idea +.vscode .phpunit.result.cache From f8c7f72d0153d753b3733de1cd5e0583a809e9d5 Mon Sep 17 00:00:00 2001 From: Daniel Morell Date: Mon, 21 Mar 2022 10:39:21 -0500 Subject: [PATCH 8/8] Removed the `composer.lock` file temporarily --- .github/workflows/ci.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 72baeee..123845c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -79,7 +79,12 @@ jobs: working-directory: rollbar-test-app # This adds time, so only run this if the previous step fails. if: ${{ steps.composer_require.outcome == 'failure' }} - run: composer update + # We are ok removing the lock file since it was generated in step 3, + # before we included all our requirements. + run: | + rm composer.lock + composer require rollbar/rollbar-laravel + composer install - name: Setup .env working-directory: rollbar-test-app