Skip to content

Commit 6d1baed

Browse files
committed
Merge branch '6.0.x'
2 parents cb7c94b + 0da4abe commit 6d1baed

File tree

3 files changed

+24
-8
lines changed

3 files changed

+24
-8
lines changed

.github/workflows/lint-and-analyse-php.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
runs-on: ubuntu-latest
1313
steps:
1414
- name: Checkout code
15-
uses: actions/checkout@v4
15+
uses: actions/checkout@v6
1616

1717
- name: Set up PHP 8.2
1818
uses: shivammathur/setup-php@v2
@@ -23,7 +23,7 @@ jobs:
2323
run: composer validate --strict
2424

2525
- name: Install Composer dependencies
26-
uses: ramsey/composer-install@v2
26+
uses: ramsey/composer-install@v4
2727
with:
2828
dependency-versions: highest
2929

@@ -37,15 +37,15 @@ jobs:
3737
php-version: [ '8.2' ]
3838
steps:
3939
- name: Checkout code
40-
uses: actions/checkout@v4
40+
uses: actions/checkout@v6
4141

4242
- name: Set up PHP ${{ matrix.php-version }}
4343
uses: shivammathur/setup-php@v2
4444
with:
4545
php-version: ${{ matrix.php-version }}
4646

4747
- name: Install Composer dependencies
48-
uses: ramsey/composer-install@v2
48+
uses: ramsey/composer-install@v4
4949
with:
5050
dependency-versions: highest
5151

.github/workflows/lint-docs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
runs-on: ubuntu-latest
1313
steps:
1414
- name: Checkout code
15-
uses: actions/checkout@v4
15+
uses: actions/checkout@v6
1616

1717
- name: Lint PHP documentation
1818
uses: sudo-bot/action-doctum@v5

.github/workflows/tests.yml

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
- { php-version: '8.5', experimental: true, os: ubuntu-latest, composer-options: '--ignore-platform-req=php+', extensions: ':apcu, mbstring' }
2525
steps:
2626
- name: Checkout code
27-
uses: actions/checkout@v4
27+
uses: actions/checkout@v6
2828
with:
2929
# Fetch some commits for Scrutinizer coverage upload
3030
fetch-depth: 15
@@ -38,7 +38,7 @@ jobs:
3838
coverage: xdebug
3939

4040
- name: Install Composer dependencies
41-
uses: ramsey/composer-install@v2
41+
uses: ramsey/composer-install@v4
4242
with:
4343
dependency-versions: highest
4444
composer-options: ${{ matrix.composer-options }}
@@ -47,10 +47,26 @@ jobs:
4747
run: composer run phpunit -- --display-deprecations --display-notices --display-warnings --display-errors --display-skipped
4848

4949
- name: Send coverage
50-
uses: codecov/codecov-action@v3
50+
uses: codecov/codecov-action@v6
51+
# Do not run this step on forked versions of the main repository (example: contributor forks)
52+
if: github.repository == 'phpmyadmin/motranslator'
53+
with:
54+
fail_ci_if_error: true
55+
token: ${{ secrets.CODECOV_TOKEN }}
56+
flags: unit-${{ matrix.php-version }}-${{ matrix.os }}
57+
name: phpunit-${{ matrix.php-version }}-${{ matrix.os }}
58+
report_type: coverage
59+
60+
- name: Upload test results
61+
uses: codecov/codecov-action@v6
62+
# Do not run this step on forked versions of the main repository (example: contributor forks)
63+
if: ${{ github.repository == 'phpmyadmin/motranslator' && !cancelled() }}
5164
with:
65+
fail_ci_if_error: true
66+
token: ${{ secrets.CODECOV_TOKEN }}
5267
flags: unit-${{ matrix.php-version }}-${{ matrix.os }}
5368
name: phpunit-${{ matrix.php-version }}-${{ matrix.os }}
69+
report_type: test_results
5470

5571
- name: Send coverage to Scrutinizer
5672
uses: sudo-bot/action-scrutinizer@latest

0 commit comments

Comments
 (0)