Skip to content

Commit f7add71

Browse files
authored
chore: revisit GH workflows (#229)
- add concurrency - minimize permissions - use latest php - updated tools --------- Signed-off-by: Jan Kowalleck <[email protected]>
1 parent 1d1cf53 commit f7add71

File tree

7 files changed

+29
-74
lines changed

7 files changed

+29
-74
lines changed

.github/dependabot.yml

Lines changed: 8 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
2-
1+
# https://docs.github.com/en/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file
32
version: 2
43
updates:
54
- package-ecosystem: 'composer'
@@ -17,64 +16,13 @@ updates:
1716
include: 'scope'
1817
open-pull-requests-limit: 999
1918

20-
- directory: '/tools/composer-require-checker'
21-
package-ecosystem: 'composer'
22-
schedule:
23-
interval: 'weekly'
24-
day: 'saturday'
25-
allow:
26-
- dependency-type: 'all'
27-
versioning-strategy: 'auto'
28-
labels: [ 'dependencies', 'tools' ]
29-
commit-message:
30-
## prefix maximum string length of 15
31-
prefix: 'tools'
32-
include: 'scope'
33-
open-pull-requests-limit: 999
34-
- directory: '/tools/composer-unused'
35-
package-ecosystem: 'composer'
36-
schedule:
37-
interval: 'weekly'
38-
day: 'saturday'
39-
allow:
40-
- dependency-type: 'all'
41-
versioning-strategy: 'auto'
42-
labels: [ 'dependencies', 'tools' ]
43-
commit-message:
44-
## prefix maximum string length of 15
45-
prefix: 'tools'
46-
include: 'scope'
47-
open-pull-requests-limit: 999
48-
- directory: '/tools/php-cs-fixer'
49-
package-ecosystem: 'composer'
50-
schedule:
51-
interval: 'weekly'
52-
day: 'saturday'
53-
allow:
54-
- dependency-type: 'all'
55-
versioning-strategy: 'auto'
56-
labels: [ 'dependencies', 'tools' ]
57-
commit-message:
58-
## prefix maximum string length of 15
59-
prefix: 'tools'
60-
include: 'scope'
61-
open-pull-requests-limit: 999
62-
- directory: '/tools/psalm'
63-
package-ecosystem: 'composer'
64-
schedule:
65-
interval: 'weekly'
66-
day: 'saturday'
67-
allow:
68-
- dependency-type: 'all'
69-
versioning-strategy: 'auto'
70-
labels: [ 'dependencies', 'tools' ]
71-
commit-message:
72-
## prefix maximum string length of 15
73-
prefix: 'tools'
74-
include: 'scope'
75-
open-pull-requests-limit: 999
76-
- directory: '/tools/composer-normalize'
77-
package-ecosystem: 'composer'
19+
- package-ecosystem: 'composer'
20+
directories:
21+
- '/tools/composer-normalize'
22+
- '/tools/composer-require-checker'
23+
- '/tools/composer-unused'
24+
- '/tools/php-cs-fixer'
25+
- '/tools/psalm'
7826
schedule:
7927
interval: 'weekly'
8028
day: 'saturday'

.github/workflows/php.yml

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,14 @@ on:
1313
# this means: at 23:42 on Fridays
1414
- cron: '42 23 * * 5'
1515

16+
concurrency:
17+
group: '${{ github.workflow }}-${{ github.ref }}'
18+
cancel-in-progress: true
19+
20+
permissions: { }
21+
1622
env:
17-
PHP_VERSION_LATEST: '8.3'
23+
PHP_VERSION_LATEST: '8.4'
1824

1925
jobs:
2026
tests:
@@ -28,7 +34,8 @@ jobs:
2834
matrix:
2935
os: [ ubuntu-latest ]
3036
php:
31-
- '8.3' # highest supported
37+
- '8.4' # highest supported
38+
- '8.3'
3239
- '8.2'
3340
- '8.1'
3441
- '8.0'
@@ -37,10 +44,10 @@ jobs:
3744
include:
3845
- # highest supported Windows
3946
os: windows-latest
40-
php: '8.3' # highest supported
47+
php: '8.4' # highest supported
4148
- # highest supported macOS
4249
os: macos-latest
43-
php: '8.3'
50+
php: '8.4'
4451
timeout-minutes: 30
4552
steps:
4653
- name: Checkout
@@ -100,7 +107,7 @@ jobs:
100107
fail-fast: false
101108
matrix:
102109
php-version:
103-
- '8.3' # highest supported
110+
- '8.4' # highest supported
104111
- '7.3' # lowest supported
105112
steps:
106113
- name: Checkout

tools/composer-normalize/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"description": "composer-normalize",
44
"type": "metapackage",
55
"require": {
6-
"php": ">=7.4"
6+
"php": ">=8.4"
77
},
88
"require-dev": {
99
"ergebnis/composer-normalize": "2.48.2",

tools/composer-require-checker/composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
"description": "composer-require-checker",
44
"type": "metapackage",
55
"require": {
6-
"php": ">=7.4"
6+
"php": ">=8.4"
77
},
88
"require-dev": {
9-
"maglnet/composer-require-checker": "3.8.0||4.7.1",
9+
"maglnet/composer-require-checker": "4.16.1",
1010
"roave/security-advisories": "dev-latest"
1111
},
1212
"prefer-stable": true,

tools/composer-unused/composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
"description": "composer-unused",
44
"type": "metapackage",
55
"require": {
6-
"php": ">=7.4"
6+
"php": ">=8.4"
77
},
88
"require-dev": {
9-
"icanhazstring/composer-unused": "0.8.11",
9+
"icanhazstring/composer-unused": "0.9.5",
1010
"roave/security-advisories": "dev-latest"
1111
},
1212
"prefer-stable": true,

tools/php-cs-fixer/composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
"description": "php-cs-fixer",
44
"type": "metapackage",
55
"require": {
6-
"php": ">=7.4"
6+
"php": ">=8.4"
77
},
88
"require-dev": {
9-
"friendsofphp/php-cs-fixer": "3.88.2",
9+
"friendsofphp/php-cs-fixer": "v3.89.0",
1010
"roave/security-advisories": "dev-latest"
1111
},
1212
"prefer-stable": true,

tools/psalm/composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
"description": "psalm and plugins",
44
"type": "metapackage",
55
"require": {
6-
"php": ">=7.4"
6+
"php": ">=8.2"
77
},
88
"require-dev": {
99
"roave/security-advisories": "dev-latest",
10-
"vimeo/psalm": "5.16"
10+
"vimeo/psalm": "5.16||6.13.1"
1111
},
1212
"prefer-stable": true,
1313
"config": {

0 commit comments

Comments
 (0)