Skip to content

Commit 15c745e

Browse files
SmetDenisSmetDenis
authored
Merge pull request #58 from JBZoo/release/8.0
8.0.0 — PHP 8.3+ floor & lock-step major
2 parents ff79c58 + 61bd816 commit 15c745e

38 files changed

Lines changed: 1406 additions & 1232 deletions

‎.github/workflows/gh-action.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
runs-on: ubuntu-latest
3030
steps:
3131
- name: Checkout code
32-
uses: actions/checkout@v2
32+
uses: actions/checkout@v7
3333

3434
- name: JUnit.xml
3535
uses: ./
@@ -73,7 +73,7 @@ jobs:
7373
runs-on: ubuntu-latest
7474
steps:
7575
- name: Checkout code
76-
uses: actions/checkout@v2
76+
uses: actions/checkout@v7
7777

7878
- name: JUnit.xml
7979
uses: jbzoo/ci-report-converter@master

‎.github/workflows/main.yml‎

Lines changed: 23 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,15 @@ permissions:
1515
contents: read
1616

1717
on:
18+
schedule:
19+
- cron: '0 4 * * *' # daily 04:00 UTC canary keepalive
1820
pull_request:
1921
branches:
2022
- "*"
2123
push:
2224
branches:
2325
- 'master'
26+
workflow_dispatch: {}
2427

2528
env:
2629
COLUMNS: 120
@@ -34,12 +37,12 @@ jobs:
3437
JBZOO_COMPOSER_UPDATE_FLAGS: ${{ matrix.composer_flags }}
3538
strategy:
3639
matrix:
37-
php-version: [ 8.2, 8.3, 8.4 ]
40+
php-version: [ 8.3, 8.4, 8.5 ]
3841
coverage: [ xdebug, none ]
3942
composer_flags: [ "--prefer-lowest", "" ]
4043
steps:
4144
- name: Checkout code
42-
uses: actions/checkout@v3
45+
uses: actions/checkout@v7
4346
with:
4447
fetch-depth: 0
4548

@@ -58,29 +61,30 @@ jobs:
5861
run: make test --no-print-directory
5962

6063
- name: Uploading coverage to coveralls
61-
if: ${{ matrix.coverage == 'xdebug' }}
64+
if: '${{ matrix.coverage == ''xdebug'' }}'
6265
continue-on-error: true
6366
env:
64-
COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }}
67+
COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }}
6568
run: make report-coveralls --no-print-directory || true
6669

6770
- name: Upload Artifacts
68-
uses: actions/upload-artifact@v4
71+
uses: actions/upload-artifact@v7
6972
continue-on-error: true
7073
with:
7174
name: PHPUnit - ${{ matrix.php-version }} - ${{ matrix.coverage }}
7275
path: build/
76+
overwrite: true
7377

7478

7579
linters:
7680
name: Linters
7781
runs-on: ubuntu-latest
7882
strategy:
7983
matrix:
80-
php-version: [ 8.2, 8.3, 8.4 ]
84+
php-version: [ 8.3, 8.4, 8.5 ]
8185
steps:
8286
- name: Checkout code
83-
uses: actions/checkout@v3
87+
uses: actions/checkout@v7
8488
with:
8589
fetch-depth: 0
8690

@@ -99,22 +103,23 @@ jobs:
99103
run: make codestyle --no-print-directory
100104

101105
- name: Upload Artifacts
102-
uses: actions/upload-artifact@v4
106+
uses: actions/upload-artifact@v7
103107
continue-on-error: true
104108
with:
105109
name: Linters - ${{ matrix.php-version }}
106110
path: build/
111+
overwrite: true
107112

108113

109114
report:
110115
name: Reports
111116
runs-on: ubuntu-latest
112117
strategy:
113118
matrix:
114-
php-version: [ 8.2, 8.3, 8.4 ]
119+
php-version: [ 8.3, 8.4, 8.5 ]
115120
steps:
116121
- name: Checkout code
117-
uses: actions/checkout@v3
122+
uses: actions/checkout@v7
118123
with:
119124
fetch-depth: 0
120125

@@ -133,22 +138,23 @@ jobs:
133138
run: make report-all --no-print-directory
134139

135140
- name: Upload Artifacts
136-
uses: actions/upload-artifact@v4
141+
uses: actions/upload-artifact@v7
137142
continue-on-error: true
138143
with:
139144
name: Reports - ${{ matrix.php-version }}
140145
path: build/
146+
overwrite: true
141147

142148

143149
phar:
144150
name: Phar
145151
runs-on: ubuntu-latest
146152
strategy:
147153
matrix:
148-
php-version: [ 8.2, 8.3, 8.4 ]
154+
php-version: [ 8.3, 8.4, 8.5 ]
149155
steps:
150156
- name: Checkout code
151-
uses: actions/checkout@v3
157+
uses: actions/checkout@v7
152158
with:
153159
fetch-depth: 0
154160

@@ -170,19 +176,20 @@ jobs:
170176
run: ./build/ci-report-converter.phar convert --help
171177

172178
- name: Upload Artifacts
173-
uses: actions/upload-artifact@v4
179+
uses: actions/upload-artifact@v7
174180
continue-on-error: true
175181
with:
176-
name: Reports - ${{ matrix.php-version }}
182+
name: Phar - ${{ matrix.php-version }}
177183
path: build/
184+
overwrite: true
178185

179186

180187
docker:
181188
name: Docker
182189
runs-on: ubuntu-latest
183190
steps:
184191
- name: Checkout code
185-
uses: actions/checkout@v3
192+
uses: actions/checkout@v7
186193
with:
187194
fetch-depth: 0
188195

‎.github/workflows/release-docker.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@ jobs:
2121
runs-on: ubuntu-latest
2222
steps:
2323
- name: Login to DockerHub
24-
uses: docker/login-action@v2
24+
uses: docker/login-action@v4
2525
with:
2626
username: ${{ secrets.DOCKERHUB_USERNAME }}
2727
password: ${{ secrets.DOCKERHUB_TOKEN }}
28-
28+
2929
- name: Build and push
30-
uses: docker/build-push-action@v3
30+
uses: docker/build-push-action@v7
3131
with:
3232
push: true
3333
tags: jbzoo/ci-report-converter:${{ env.GITHUB_REF_NAME }}

‎.github/workflows/release-draft.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,6 @@ jobs:
2222
runs-on: ubuntu-latest
2323
steps:
2424
- name: Draft Release
25-
uses: release-drafter/release-drafter@v5.15.0
25+
uses: release-drafter/release-drafter@v7
2626
env:
2727
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

‎CLAUDE.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ CI-Report-Converter is a PHP library that converts error reports between differe
7070

7171
## Dependencies
7272

73-
- PHP 8.2+ required
73+
- PHP 8.3+ required
7474
- Symfony Console for CLI interface
7575
- JBZoo packages (cli, data, utils, markdown)
7676
- Development dependencies include jbzoo/toolbox-dev for code quality tools

‎Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
# @see https://github.com/JBZoo/CI-Report-Converter
1111
#
1212

13-
FROM php:8.2-cli-alpine
13+
FROM php:8.5-cli-alpine
1414
RUN mv "$PHP_INI_DIR/php.ini-production" "$PHP_INI_DIR/php.ini"
1515

1616
ADD https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions /usr/local/bin/

‎README.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ Well... It may seem to you it's a useless thing, and _your favorite super tool_
6262

6363
## Requirements
6464

65-
- PHP 8.2 or higher
65+
- PHP 8.3 or higher
6666
- Extensions: dom, simplexml, hash
6767

6868
## Installing
@@ -246,7 +246,7 @@ Options:
246246
--timestamp Show timestamp at the beginning of each message.It will be used only for text output format.
247247
--profile Display timing and memory usage information.
248248
--output-mode=OUTPUT-MODE Output format. Available options:
249-
text - Default text output format, userfriendly and easy to read.
249+
text - Default text output format, user-friendly and easy to read.
250250
cron - Shortcut for crontab. It's basically focused on human-readable logs output.
251251
It's combination of --timestamp --profile --stdout-only --no-progress -vv.
252252
logstash - Logstash output format, for integration with ELK stack.
@@ -290,7 +290,7 @@ Options:
290290
--timestamp Show timestamp at the beginning of each message.It will be used only for text output format.
291291
--profile Display timing and memory usage information.
292292
--output-mode=OUTPUT-MODE Output format. Available options:
293-
text - Default text output format, userfriendly and easy to read.
293+
text - Default text output format, user-friendly and easy to read.
294294
cron - Shortcut for crontab. It's basically focused on human-readable logs output.
295295
It's combination of --timestamp --profile --stdout-only --no-progress -vv.
296296
logstash - Logstash output format, for integration with ELK stack.

‎composer.json‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -41,22 +41,22 @@
4141
"prefer-stable" : true,
4242

4343
"require" : {
44-
"php" : "^8.2",
44+
"php" : "^8.3",
4545
"ext-dom" : "*",
4646
"ext-simplexml" : "*",
4747
"ext-hash" : "*",
4848

49-
"jbzoo/data" : "^7.2",
50-
"jbzoo/utils" : "^7.3",
51-
"jbzoo/cli" : "^7.2.4",
52-
"jbzoo/markdown" : "^7.0.1",
49+
"jbzoo/data" : "^8.0",
50+
"jbzoo/utils" : "^8.0",
51+
"jbzoo/cli" : "^8.0",
52+
"jbzoo/markdown" : "^8.0",
5353

5454
"symfony/console" : ">=7.3.4"
5555
},
5656

5757
"require-dev" : {
58-
"jbzoo/toolbox-dev" : "^7.3",
59-
"jbzoo/mermaid-php" : "^7.2.4",
58+
"jbzoo/toolbox-dev" : "^8.0",
59+
"jbzoo/mermaid-php" : "^8.0",
6060
"roave/security-advisories" : "dev-master"
6161
},
6262

@@ -78,7 +78,7 @@
7878

7979
"extra" : {
8080
"branch-alias" : {
81-
"dev-master" : "7.x-dev"
81+
"dev-master" : "8.x-dev"
8282
}
8383
}
8484
}

0 commit comments

Comments
 (0)