Skip to content

Commit 6a30a62

Browse files
authored
Merge pull request #33 from step2dev/2.x-update
Update from V1
2 parents 7c873d9 + be0c8c7 commit 6a30a62

10 files changed

Lines changed: 111 additions & 105 deletions

.github/dependabot.yml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,11 @@ updates:
99
schedule:
1010
interval: "weekly"
1111
labels:
12-
- "dependencies"
12+
- "dependencies"
13+
14+
- package-ecosystem: "composer"
15+
directory: "/"
16+
schedule:
17+
interval: "weekly"
18+
labels:
19+
- "dependencies"

.github/workflows/codeql.yml

Lines changed: 0 additions & 84 deletions
This file was deleted.
Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
name: Delete old workflow runs
2+
on:
3+
workflow_dispatch:
4+
inputs:
5+
days:
6+
description: 'Days-worth of runs to keep for each workflow'
7+
required: true
8+
default: '30'
9+
minimum_runs:
10+
description: 'Minimum runs to keep for each workflow'
11+
required: true
12+
default: '6'
13+
delete_workflow_pattern:
14+
description: 'Name or filename of the workflow (if not set, all workflows are targeted)'
15+
required: false
16+
delete_workflow_by_state_pattern:
17+
description: 'Filter workflows by state: active, deleted, disabled_fork, disabled_inactivity, disabled_manually'
18+
required: true
19+
default: "ALL"
20+
type: choice
21+
options:
22+
- "ALL"
23+
- active
24+
- deleted
25+
- disabled_inactivity
26+
- disabled_manually
27+
delete_run_by_conclusion_pattern:
28+
description: 'Remove runs based on conclusion: action_required, cancelled, failure, skipped, success'
29+
required: true
30+
default: "ALL"
31+
type: choice
32+
options:
33+
- "ALL"
34+
- "Unsuccessful: action_required,cancelled,failure,skipped"
35+
- action_required
36+
- cancelled
37+
- failure
38+
- skipped
39+
- success
40+
dry_run:
41+
description: 'Logs simulated changes, no deletions are performed'
42+
required: false
43+
44+
jobs:
45+
del_runs:
46+
runs-on: ubuntu-latest
47+
permissions:
48+
actions: write
49+
contents: read
50+
steps:
51+
- name: Delete workflow runs
52+
uses: Mattraks/delete-workflow-runs@v2
53+
with:
54+
token: ${{ github.token }}
55+
repository: ${{ github.repository }}
56+
retain_days: ${{ github.event.inputs.days }}
57+
keep_minimum_runs: ${{ github.event.inputs.minimum_runs }}
58+
delete_workflow_pattern: ${{ github.event.inputs.delete_workflow_pattern }}
59+
delete_workflow_by_state_pattern: ${{ github.event.inputs.delete_workflow_by_state_pattern }}
60+
delete_run_by_conclusion_pattern: >-
61+
${{
62+
startsWith(github.event.inputs.delete_run_by_conclusion_pattern, 'Unsuccessful:')
63+
&& 'action_required,cancelled,failure,skipped'
64+
|| github.event.inputs.delete_run_by_conclusion_pattern
65+
}}
66+
dry_run: ${{ github.event.inputs.dry_run }}

.github/workflows/dependabot-auto-merge.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313

1414
- name: Dependabot metadata
1515
id: metadata
16-
uses: dependabot/fetch-metadata@v2.3.0
16+
uses: dependabot/fetch-metadata@v2.4.0
1717
with:
1818
github-token: "${{ secrets.GITHUB_TOKEN }}"
1919

.github/workflows/fix-php-code-style-issues.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
uses: aglipanci/laravel-pint-action@2.5
2323

2424
- name: Commit changes
25-
uses: stefanzweifel/git-auto-commit-action@v5
25+
uses: stefanzweifel/git-auto-commit-action@v6
2626
with:
2727
token: ${{secrets.GITHUB_TOKEN}}
2828
commit_message: Fix styling

.github/workflows/phpstan.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
name: PHPStan
22

3+
permissions:
4+
contents: read
5+
36
on:
47
push:
58
paths:
@@ -16,7 +19,7 @@ jobs:
1619
- name: Setup PHP
1720
uses: shivammathur/setup-php@v2
1821
with:
19-
php-version: '8.1'
22+
php-version: '8.2'
2023
coverage: none
2124

2225
- name: Install composer dependencies

.github/workflows/run-tests.yml

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,34 @@ on:
66
pull_request:
77
branches: [main]
88

9+
permissions:
10+
contents: read
11+
912
jobs:
1013
test:
1114
runs-on: ${{ matrix.os }}
1215
strategy:
1316
fail-fast: true
1417
matrix:
1518
os: [ubuntu-latest, windows-latest]
16-
php: [8.2, 8.1]
17-
laravel: [10.*]
18-
stability: [prefer-lowest, prefer-stable]
19+
php: [ 8.4, 8.3, 8.2, 8.1]
20+
laravel: [ 12.*, 11.*, 10.* ]
21+
stability: [ prefer-stable ] #prefer-lowest,
1922
include:
23+
- laravel: 12.*
24+
testbench: 10.*
25+
carbon: ^3.8.4
26+
- laravel: 11.*
27+
testbench: 9.*
28+
carbon: ^3.8.4
2029
- laravel: 10.*
2130
testbench: 8.*
2231
carbon: ^2.67
32+
exclude:
33+
- php: 8.1
34+
laravel: 11.*
35+
- php: 8.1
36+
laravel: 12.*
2337

2438
name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }}
2539

.github/workflows/update-changelog.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
release-notes: ${{ github.event.release.body }}
2525

2626
- name: Commit updated CHANGELOG
27-
uses: stefanzweifel/git-auto-commit-action@v5
27+
uses: stefanzweifel/git-auto-commit-action@v6
2828
with:
2929
branch: main
3030
commit_message: Update CHANGELOG

CHANGELOG.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,11 @@ All notable changes to `lazy-ui` will be documented in this file.
2626
* Merge all fix by @CrazyBoy49z in https://github.com/step2dev/lazy-ui/pull/24
2727
* Update composer.json by @CrazyBoy49z in https://github.com/step2dev/lazy-ui/pull/26
2828

29-
**Full Changelog**: https://github.com/step2dev/lazy-ui/compare/v1.0.0...1.1.0
3029

3130
## v1.1.0 - 2025-03-10
3231

3332
**Full Changelog**: https://github.com/step2dev/lazy-ui/compare/v1.0.0...v1.0.0
3433

35-
## 1.0.0 -
36-
- Initial release
34+
## 1.0.0 -
3735

36+
- Initial release

composer.json

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -31,16 +31,17 @@
3131
"spatie/laravel-package-tools": "^1.14.0"
3232
},
3333
"require-dev": {
34-
"laravel/pint": "^1.0",
35-
"nunomaduro/collision": "^7.9",
36-
"nunomaduro/larastan": "^2.0.1",
37-
"orchestra/testbench": "^8.0",
38-
"pestphp/pest": "^2.0",
39-
"pestphp/pest-plugin-arch": "^2.0",
40-
"pestphp/pest-plugin-laravel": "^2.0",
41-
"phpstan/extension-installer": "^1.1",
42-
"phpstan/phpstan-deprecation-rules": "^1.0",
43-
"phpstan/phpstan-phpunit": "^1.0"
34+
35+
"laravel/pint": "^1.14",
36+
"nunomaduro/collision": "^8.1.1||^7.10.0",
37+
"larastan/larastan": "^2.9||^3.0",
38+
"orchestra/testbench": "^10.0.0||^9.0.0||^8.22.0",
39+
"pestphp/pest": "^2.0||^3.0",
40+
"pestphp/pest-plugin-arch": "^2.0||^3.0",
41+
"pestphp/pest-plugin-laravel": "^2.0||^3.0",
42+
"phpstan/extension-installer": "^1.3||^2.0",
43+
"phpstan/phpstan-deprecation-rules": "^1.1||^2.0",
44+
"phpstan/phpstan-phpunit": "^1.3||^2.0"
4445
},
4546
"autoload": {
4647
"psr-4": {

0 commit comments

Comments
 (0)