Skip to content

Commit 1464c8f

Browse files
author
Andrey Helldar
committed
Merge branch '2.x' into laravel-9
# Conflicts: # .editorconfig # .github/workflows/coverage.yml # .github/workflows/laravel-6-8.yml # .github/workflows/laravel-6.yml # .github/workflows/phpunit.yml # README.md # composer.json
2 parents edf01c0 + ba0bd3d commit 1464c8f

File tree

64 files changed

+1099
-1103
lines changed

Some content is hidden

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

64 files changed

+1099
-1103
lines changed

.codecov.yml

Lines changed: 0 additions & 1 deletion
This file was deleted.

.editorconfig

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

.github/FUNDING.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
1-
tidelift: "packagist/andrey-helldar/laravel-actions"
2-
custom: ["https://paypal.me/helldar"]
1+
patreon: andrey_helldar
2+
open_collective: dragon-code
3+
custom: [ "https://paypal.me/helldar", "https://yoomoney.ru/to/410012608840929" ]

.github/ISSUE_TEMPLATE/config.yml

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

.github/workflows/coverage.yml

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

.github/workflows/laravel-6-8.yml renamed to .github/workflows/laravel-6.yml

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: phpunit
1+
name: "Laravel 6"
22
on: [ push ]
33

44
jobs:
@@ -9,9 +9,9 @@ jobs:
99
fail-fast: true
1010
matrix:
1111
php: [ "7.3", "7.4", "8.0" ]
12-
laravel: [ "6.0", "7.0", "8.0" ]
12+
laravel: [ "6.0" ]
1313

14-
name: Laravel ${{ matrix.laravel }}, PHP ${{ matrix.php }}
14+
name: PHP ${{ matrix.php }}
1515

1616
steps:
1717
- name: Checkout code
@@ -25,8 +25,7 @@ jobs:
2525
coverage: none
2626

2727
- name: Install dependencies
28-
run: |
29-
composer require laravel/framework:^${{ matrix.laravel }}
30-
composer update --prefer-stable --prefer-dist --no-progress --no-interaction
28+
run: composer require --dev laravel/framework:^${{ matrix.laravel }}
29+
3130
- name: Execute tests
3231
run: sudo vendor/bin/phpunit

.github/workflows/laravel-7.yml

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
name: "Laravel 7"
2+
on: [ push ]
3+
4+
jobs:
5+
build:
6+
runs-on: ubuntu-latest
7+
8+
strategy:
9+
fail-fast: true
10+
matrix:
11+
php: [ "7.3", "7.4", "8.0" ]
12+
laravel: [ "7.0" ]
13+
14+
name: PHP ${{ matrix.php }}
15+
16+
steps:
17+
- name: Checkout code
18+
uses: actions/checkout@v2
19+
20+
- name: Setup PHP
21+
uses: shivammathur/setup-php@v2
22+
with:
23+
php-version: ${{ matrix.php }}
24+
extensions: curl, mbstring, zip, pcntl, pdo, pdo_sqlite, iconv
25+
coverage: none
26+
27+
- name: Install dependencies
28+
run: composer require --dev laravel/framework:^${{ matrix.laravel }}
29+
30+
- name: Execute tests
31+
run: sudo vendor/bin/phpunit

.github/workflows/laravel-8.yml

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
name: "Laravel 8"
2+
on: [ push ]
3+
4+
jobs:
5+
build:
6+
runs-on: ubuntu-latest
7+
8+
strategy:
9+
fail-fast: true
10+
matrix:
11+
php: [ "7.3", "7.4", "8.0", "8.1" ]
12+
laravel: [ "8.0" ]
13+
14+
name: PHP ${{ matrix.php }}
15+
16+
steps:
17+
- name: Checkout code
18+
uses: actions/checkout@v2
19+
20+
- name: Setup PHP
21+
uses: shivammathur/setup-php@v2
22+
with:
23+
php-version: ${{ matrix.php }}
24+
extensions: curl, mbstring, zip, pcntl, pdo, pdo_sqlite, iconv
25+
coverage: none
26+
27+
- name: Install dependencies
28+
run: composer require --dev laravel/framework:^${{ matrix.laravel }}
29+
30+
- name: Execute tests
31+
run: sudo vendor/bin/phpunit

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
MIT License
22

3-
Copyright (c) 2021 Andrey Helldar
3+
Copyright (c) 2022 Andrey Helldar
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

0 commit comments

Comments
 (0)