Skip to content

Commit d7647ff

Browse files
authored
Merge pull request #131 from rollbar/rollbar-v3
Add support for Rollbar v3
2 parents a6c803d + f8c7f72 commit d7647ff

File tree

3 files changed

+26
-1
lines changed

3 files changed

+26
-1
lines changed

.github/workflows/ci.yml

+23
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,12 @@ jobs:
3434
php: [8.1, 8.0, 7.4, 7.3, 7.2]
3535
laravel: [^9, ^8, ^7, ^6]
3636
exclude:
37+
# Laravel 6 requires php 7.2-8.0, so exclude all php versions after 8.1
38+
- laravel: ^6
39+
php: 8.1
40+
# Laravel 7 requires php 7.2-8.0, so exclude all php versions after 8.1
41+
- laravel: ^7
42+
php: 8.1
3743
# Laravel 8 requires php 7.3+, so exclude all PHP versions prior to 7.3
3844
- laravel: ^8
3945
php: 7.2
@@ -62,10 +68,27 @@ jobs:
6268
run: composer create-project laravel/laravel rollbar-test-app ${{ matrix.laravel }}
6369

6470
- name: Install that code using Composer rigged to look in the parent directory
71+
id: composer_require
6572
working-directory: rollbar-test-app
73+
continue-on-error: true
6674
run: |
6775
composer config repositories.local '{"type":"path", "url":".."}'
6876
composer require rollbar/rollbar-laravel
77+
78+
- name: Try to resolve requirements into an installable set of packages
79+
working-directory: rollbar-test-app
80+
# This adds time, so only run this if the previous step fails.
81+
if: ${{ steps.composer_require.outcome == 'failure' }}
82+
# We are ok removing the lock file since it was generated in step 3,
83+
# before we included all our requirements.
84+
run: |
85+
rm composer.lock
86+
composer require rollbar/rollbar-laravel
87+
composer install
88+
89+
- name: Setup .env
90+
working-directory: rollbar-test-app
91+
run: |
6992
echo "ROLLBAR_TOKEN=${ROLLBAR_TOKEN}" >> .env
7093
echo "GITHUB_RUN_ID=${GITHUB_RUN_ID}" >> .env
7194
chmod 400 .env

.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
/vendor
22
composer.lock
33
.DS_Store
4+
.idea
5+
.vscode
46
.phpunit.result.cache

composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
"require": {
2525
"php": ">=7.2|^8.0",
2626
"illuminate/support": "^6.0|^7.0|^8.0|^9.0",
27-
"rollbar/rollbar": "^2"
27+
"rollbar/rollbar": "^2.0 | ^3.1"
2828
},
2929
"require-dev": {
3030
"orchestra/testbench": "^4.0|^5.0|^6.0|^7.0",

0 commit comments

Comments
 (0)