Skip to content

Commit 8cd84c8

Browse files
committed
Merge branch 'main' into image-column-support-private-bucket
2 parents 4a3bd1a + d221069 commit 8cd84c8

File tree

559 files changed

+235782
-12797
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

559 files changed

+235782
-12797
lines changed

.github/ISSUE_TEMPLATE/config.yml

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,9 @@ contact_links:
33
- name: Documentation issue
44
url: https://github.com/laravel-backpack/docs
55
about: For documentation issues, open an issue or pull request in our docs repository.
6-
- name: Help & support
6+
- name: How Do I X?
77
url: https://stackoverflow.com/questions/tagged/backpack-for-laravel
8-
about: Backpack doesn't offer official support - only community support. Please post your question & code on StackOverflow, using the backpack-for-laravel tag. We've been blessed with a great community, that is happy to help.
9-
- name: Quick question
10-
url: https://gitter.im/BackpackForLaravel/Lobby
11-
about: If you have an urgent matter that won't take much time to answer, use our 24/7 Gitter chatroom. Tens of people hang out there sometimes. But keep in mind chatrooms are NOT a good place to post code, or ask for anything more than a quick answer.
12-
- name: Miscellaneous
13-
url: https://www.reddit.com/r/BackpackForLaravel/
14-
about: If you just want to bounce ideas off someone, share something you've made, or talk about Backpack, Laravel or web development in general - join our subreddit.
8+
about: Backpack doesn't offer official support - only community support. Please post your question on StackOverflow, using the backpack-for-laravel tag. We've been blessed with a great community, that is happy to help.
9+
- name: Community Forum
10+
url: https://github.com/Laravel-Backpack/community-forum/discussions/new
11+
about: If you have an idea, question or problem and you don't know where it fits, use our Community Forum. This is where we hang out and talk about all kinds of stuff.

.github/dependabot.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,3 +23,8 @@ updates:
2323
versions:
2424
- 10.1.0
2525
- 10.1.1
26+
- package-ecosystem: "github-actions"
27+
directory: "/"
28+
schedule:
29+
interval: monthly
30+
open-pull-requests-limit: 10

.github/invite-contributors.yml

Lines changed: 0 additions & 4 deletions
This file was deleted.

.github/pull_request_template.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,3 +25,11 @@
2525
### How can we test the before & after?
2626

2727
??
28+
29+
If the PR has changes in multiple repos please provide the command to checkout all branches, eg.:
30+
```bash
31+
git checkout "dev-branch-name" &&
32+
cd vendor/backpack/crud && git checkout crud-branch-name &&
33+
cd ../pro && git checkout pro-branch-name &&
34+
cd ../../..
35+
```

.github/release-drafter.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66
# branches to consider in the event; optional, defaults to all
77
branches:
88
- 4.1
9-
- v5
9+
- main
1010

1111
jobs:
1212
update_release_draft:

.github/workflows/add-to-project.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ on:
99
types:
1010
- opened
1111

12+
permissions: {}
1213
jobs:
1314
add-to-project:
1415
name: Add new bugs and PRs to This Week project

.github/workflows/coverage.yml

Lines changed: 82 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,82 @@
1+
name: Generate Code Coverage Report
2+
on:
3+
push:
4+
branches:
5+
- main
6+
permissions:
7+
contents: write
8+
jobs:
9+
test:
10+
if: ${{ github.actor != 'dependabot[bot]' }}
11+
runs-on: ubuntu-latest
12+
name: PHP setup
13+
steps:
14+
15+
- name: Checkout code
16+
uses: actions/checkout@v3
17+
with:
18+
ref: main
19+
fetch-depth: 0
20+
- name: Install SQLite 3
21+
run: |
22+
sudo apt-get update
23+
sudo apt-get install sqlite3
24+
- name: Setup PHP
25+
uses: shivammathur/setup-php@v2
26+
with:
27+
php-version: 8.1
28+
extensions: curl, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, iconv, xdebug
29+
coverage: xdebug
30+
tools: composer:v2
31+
- name: Install dependencies
32+
run: |
33+
composer require "laravel/framework:^9.0" "phpunit/phpunit:^9.0" "doctrine/dbal:^3.0" --no-interaction --no-update --no-suggest
34+
composer update --prefer-dist --no-interaction
35+
- name: Execute tests
36+
run: vendor/bin/phpunit --coverage-clover coverage.xml
37+
- name: Check test coverage
38+
id: test-coverage
39+
uses: johanvanhelden/gha-clover-test-coverage-check@v1
40+
with:
41+
percentage: "1"
42+
filename: coverage.xml
43+
metric: elements
44+
rounded-precision: 2
45+
- name: Generate the badge SVG image
46+
uses: emibcn/badge-action@v1
47+
id: badge
48+
with:
49+
label: coverage
50+
status: ${{ steps.test-coverage.outputs.coverage-rounded-display }}
51+
path: ./test-coverage.svg
52+
color: ${{ steps.test-coverage.outputs.coverage > 90 && 'green' ||
53+
steps.test-coverage.outputs.coverage > 80 && 'yellow,green, green' ||
54+
steps.test-coverage.outputs.coverage > 70 && 'yellow, green' ||
55+
steps.test-coverage.outputs.coverage > 60 && 'yellow,yellow, green' ||
56+
steps.test-coverage.outputs.coverage > 50 && 'orange' ||
57+
steps.test-coverage.outputs.coverage > 40 && 'red,orange' ||
58+
steps.test-coverage.outputs.coverage > 30 && 'red,red,orange' ||
59+
steps.test-coverage.outputs.coverage > 20 && 'red,red,red,orange' ||
60+
'red' }}
61+
- name: Upload badge as artifact
62+
uses: actions/upload-artifact@v3
63+
with:
64+
name: badge
65+
path: test-coverage.svg
66+
if-no-files-found: error
67+
- name: Commit badge
68+
continue-on-error: true
69+
env:
70+
BADGE: test-coverage.svg
71+
run: |
72+
git config --local user.email "[email protected]"
73+
git config --local user.name "GitHub Action"
74+
git add "${BADGE}"
75+
git commit -m "Update Coverage Badge"
76+
- name: Push badge commit
77+
uses: ad-m/github-push-action@master
78+
if: ${{ success() }}
79+
with:
80+
force: true
81+
github_token: ${{ secrets.COVERAGE_TOKEN }}
82+
branch: coverage-badge-dont-delete

.github/workflows/testing.yml

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@ on:
55
schedule:
66
- cron: '0 0 * * *'
77

8+
permissions:
9+
contents: read # to fetch code (actions/checkout)
10+
811
jobs:
912
test:
1013
runs-on: ubuntu-latest
@@ -16,17 +19,24 @@ jobs:
1619
# run all combinations of the following, to make sure they're working together
1720
matrix:
1821
# os: [ubuntu-latest, macos-latest, windows-latest]
19-
php: [7.3, 7.4, 8.0, 8.1]
22+
php: [7.3, 7.4, 8.0, 8.1, 8.2]
2023
dbal: [^2.5, ^3.0]
21-
laravel: [8.*]
24+
laravel: [8.*, 9.*]
2225
phpunit: [8.*, 9.*]
2326
dependency-version: [stable] # to add: lowest
27+
exclude:
28+
- laravel: 9.*
29+
php: 7.3
30+
- laravel: 9.*
31+
php: 7.4
32+
- laravel: 9.*
33+
phpunit: 8.*
2434

2535
name: PHP ${{ matrix.php }}, Laravel ${{ matrix.laravel }}, PHPUnit ${{ matrix.phpunit }}, DBAL ${{ matrix.dbal }} --prefer-${{ matrix.dependency-version }}
2636

2737
steps:
2838
- name: Checkout code
29-
uses: actions/checkout@v2
39+
uses: actions/checkout@v3
3040

3141
- name: Install SQLite 3
3242
run: |

.scrutinizer.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@ build:
1919
tests:
2020
override:
2121
- php-scrutinizer-run
22+
dependencies:
23+
override:
24+
- composer install --dev
2225
tools:
2326
php_analyzer: true
2427
php_mess_detector: true

.travis.yml

Lines changed: 0 additions & 25 deletions
This file was deleted.

0 commit comments

Comments
 (0)