Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(config): Apply latest config changes to stable branch #325

Merged
merged 57 commits into from
Aug 18, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
57 commits
Select commit Hold shift + click to select a range
c884785
Merge branch 'master' into develop
abrain Feb 11, 2024
a75bc13
chore(deps): update dependency phpunit/phpunit to v9.6.17
renovate-bot Feb 23, 2024
0d79748
chore(deps): update all non-major dependencies
renovate-bot Mar 16, 2024
16d210b
Merge pull request #291 from abrain/renovate/devdependencies-(non-major)
abrain Mar 17, 2024
b5e41d3
chore(deps): update dependency phpunit/phpunit to v9.6.18
renovate-bot Mar 21, 2024
eea90de
Merge pull request #292 from abrain/renovate/devdependencies-(non-major)
abrain Mar 24, 2024
df4b4f6
chore(deps): update dependency wp-coding-standards/wpcs to v3.1.0
renovate-bot Mar 25, 2024
ff72f19
Merge pull request #293 from abrain/renovate/devdependencies-(non-major)
abrain Mar 30, 2024
18fc213
Sign Drone config
abrain Mar 30, 2024
2594108
Merge remote-tracking branch 'origin/develop' into renovate/all-minor…
abrain Mar 30, 2024
936c8e3
Merge pull request #289 from abrain/renovate/all-minor-patch
abrain Mar 30, 2024
26aec2f
Merge branch 'master' into develop
abrain Apr 1, 2024
51f4171
chore(deps): update devdependencies (non-major)
renovate-bot Apr 5, 2024
7f453c5
Merge pull request #297 from abrain/renovate/devdependencies-(non-major)
abrain Apr 5, 2024
25eaea7
chore(deps): update php docker tag to v8.3.6
renovate-bot Apr 11, 2024
353fb9a
Sign Drone config
abrain Apr 21, 2024
5096f92
Merge pull request #300 from abrain/renovate/all-minor-patch
abrain Apr 21, 2024
e26c8ec
chore(deps): update php docker tag to v8.3.7
renovate-bot May 10, 2024
5dd9d1f
Sign Drone config
abrain May 15, 2024
bd10570
Merge pull request #302 from abrain/renovate/all-minor-patch
abrain May 15, 2024
227cf11
chore(deps): update dependency phpcompatibility/phpcompatibility-wp t…
renovate-bot May 17, 2024
c45372f
Merge pull request #301 from abrain/renovate/devdependencies-(non-major)
abrain May 17, 2024
ddd91a2
chore(deps): update all non-major dependencies
renovate-bot Jul 6, 2024
2cc6af2
Sign Drone config
abrain Jul 9, 2024
dcd39e4
Merge pull request #304 from abrain/renovate/all-minor-patch
abrain Jul 9, 2024
ce9f370
chore(deps): update dependency phpunit/phpunit to v9.6.20
renovate-bot Jul 10, 2024
d3767c8
Merge pull request #309 from abrain/renovate/devdependencies-(non-major)
abrain Jul 13, 2024
766238b
chore(deps): update all non-major dependencies
renovate-bot Aug 12, 2024
429a888
Sign Drone config
abrain Aug 17, 2024
a40fd93
Merge pull request #310 from abrain/renovate/all-minor-patch
abrain Aug 17, 2024
e079f38
ci: Add new CI workflow
abrain Aug 17, 2024
799f195
Skip database creation
abrain Aug 17, 2024
40f0d40
Add missing PHPUnit downgrade and cacheing
abrain Aug 17, 2024
1fa1280
Fix Codecov upload
abrain Aug 17, 2024
1984adf
Fix PHPUnit downgrade
abrain Aug 17, 2024
1afe30b
Try to fix PHP downgrade
abrain Aug 17, 2024
759972f
Exclude unwanted files from upload to Codecov
abrain Aug 17, 2024
0451adf
Remove the lockfile before downgrading and install right away
abrain Aug 17, 2024
579b5e7
Remove obsolete files
abrain Aug 17, 2024
03c0a66
Merge pull request #311 from abrain/github-actions
abrain Aug 17, 2024
53a7c81
chore(config): Modernize Renovate config
abrain Aug 17, 2024
6ad9be5
Merge pull request #312 from abrain/renovate-config
abrain Aug 17, 2024
b03e5a8
chore(deps): pin dependencies
renovate-bot Aug 17, 2024
d132516
chore(config): migrate config renovate.json
renovate-bot Aug 17, 2024
dc6fff1
Merge remote-tracking branch 'origin/renovate/pin-dependencies' into …
abrain Aug 17, 2024
b5f71d2
Merge remote-tracking branch 'origin/renovate/migrate-config' into de…
abrain Aug 17, 2024
e4930e7
chore(deps): update actions/cache action to v4
renovate-bot Aug 17, 2024
a8f3757
Merge remote-tracking branch 'origin/renovate/actions-cache-4.x' into…
abrain Aug 17, 2024
e62b7ff
chore(deps): update mariadb docker tag to v11
renovate-bot Aug 18, 2024
79dbea0
Merge remote-tracking branch 'origin/renovate/mariadb-11.x' into develop
abrain Aug 18, 2024
0c109de
ci: Try different approach to test minimal versions
abrain Aug 18, 2024
1f913a3
ci: Explicitly remove Composer files and then require minimal depende…
abrain Aug 18, 2024
3a0d10e
Merge pull request #323 from abrain/test-minimum
abrain Aug 18, 2024
58751f4
chore(deps): Remove redundant dependency
abrain Aug 18, 2024
4908305
Merge pull request #324 from abrain/redundant-dependency
abrain Aug 18, 2024
81554c3
chore(deps): update dependency friendsofphp/php-cs-fixer to v3
renovate-bot Aug 18, 2024
d1301ed
Merge branch 'renovate/major-3-linters' into develop
abrain Aug 18, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
136 changes: 0 additions & 136 deletions .drone.yml

This file was deleted.

158 changes: 158 additions & 0 deletions .github/workflows/continuous-integration.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,158 @@
name: Continuous Integration

on:
push:
branches: [ "develop", "master" ]
pull_request:
branches: [ "develop", "master" ]

permissions:
contents: read

jobs:
compliance:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4

- name: Setup PHP
uses: shivammathur/setup-php@c541c155eee45413f5b09a52248675b1a2575231 # 2.31.1
with:
php-version: '8.3'
coverage: none

- name: Validate composer.json and composer.lock
run: composer validate --strict

- name: Cache Composer packages
id: composer-cache
uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4
with:
path: vendor
key: ${{ runner.os }}-php-${{ hashFiles('**/composer.lock') }}
restore-keys: |
${{ runner.os }}-php-

- name: Install dependencies
run: composer install --prefer-dist --no-progress

- name: Check style and compatibility
run: composer exec phpcs

test-latest:
runs-on: ubuntu-latest
needs:
- compliance

services:
mysql:
image: mariadb:11.5.2@sha256:4b812bbd9a025569fbe5a7a70e4a3cd3af53aa36621fecb1c2e108af2113450a
env:
MARIADB_USER: wptestuser
MARIADB_PASSWORD: wptestpass
MARIADB_ROOT_PASSWORD: wptestroot
MARIADB_DATABASE: wptest_latest
TZ: Europe/Berlin
ports:
- 3306/tcp
options: --health-cmd="mariadb-admin ping" --health-interval=10s --health-timeout=5s --health-retries=3

steps:
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4

- name: Setup PHP
uses: shivammathur/setup-php@c541c155eee45413f5b09a52248675b1a2575231 # 2.31.1
with:
php-version: '8.3'
coverage: xdebug
extensions: mysqli

- name: Cache Composer packages
id: composer-cache
uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4
with:
path: vendor
key: ${{ runner.os }}-php-${{ hashFiles('**/composer.lock') }}
restore-keys: |
${{ runner.os }}-php-

- name: Install dependencies
run: composer install --prefer-dist --no-progress

- name: Run unit tests
run: composer exec phpunit

- name: Set up integration test
run: ./bin/install-wp-tests.sh wptest_latest wptestuser wptestpass 127.0.0.1:${{ job.services.mysql.ports['3306'] }} latest true

- name: Run integration tests
run: composer exec phpunit -- -c phpunit-integration.xml

- name: Upload code coverage to Code Climate
uses: paambaati/codeclimate-action@7c100bd1ed15de0bdee476b38ca759d8c94207b5 # v8.0.0
env:
CC_TEST_REPORTER_ID: ${{secrets.CC_TEST_REPORTER_ID}}
with:
coverageLocations: |
${{github.workspace}}/build/logs/clover.xml:clover
${{github.workspace}}/build/logs/clover-integration.xml:clover

- name: Upload code coverage to Codecov (unit)
uses: codecov/codecov-action@e28ff129e5465c2c0dcc6f003fc735cb6ae0c673 # v4.5.0
with:
fail_ci_if_error: true
token: ${{ secrets.CODECOV_TOKEN }}
disable_search: true
file: ${{github.workspace}}/build/logs/clover.xml
flags: unit

- name: Upload code coverage to Codecov (integration)
uses: codecov/codecov-action@e28ff129e5465c2c0dcc6f003fc735cb6ae0c673 # v4.5.0
with:
fail_ci_if_error: true
token: ${{ secrets.CODECOV_TOKEN }}
disable_search: true
file: ${{github.workspace}}/build/logs/clover-integration.xml
flags: integration


test-minimum:
runs-on: ubuntu-latest
needs:
- compliance

services:
mysql:
image: mariadb:11.5.2@sha256:4b812bbd9a025569fbe5a7a70e4a3cd3af53aa36621fecb1c2e108af2113450a
env:
MARIADB_USER: wptestuser
MARIADB_PASSWORD: wptestpass
MARIADB_ROOT_PASSWORD: wptestroot
MARIADB_DATABASE: wptest_minimum
TZ: Europe/Berlin
ports:
- 3306/tcp
options: --health-cmd="mariadb-admin ping" --health-interval=10s --health-timeout=5s --health-retries=3

steps:
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4

- name: Setup PHP
id: setup-minimum-php
uses: shivammathur/setup-php@c541c155eee45413f5b09a52248675b1a2575231 # 2.31.1
with:
php-version: '7.1'
coverage: none
extensions: mysqli

- name: Install minimal test requirements
run: |
rm composer.json composer.lock
composer require --dev --no-progress "phpunit/phpunit:^6" "yoast/phpunit-polyfills:1.1.1" "brain/monkey:2.6.1"

- name: Set up integration test
run: ./bin/install-wp-tests.sh wptest_minimum wptestuser wptestpass 127.0.0.1:${{ job.services.mysql.ports['3306'] }} 5.6 true

- name: Run integration tests
run: composer exec phpunit -- -c phpunit-integration.xml --no-coverage
14 changes: 0 additions & 14 deletions bin/check-branch-name.sh

This file was deleted.

43 changes: 0 additions & 43 deletions bin/check-version-tags.sh

This file was deleted.

19 changes: 0 additions & 19 deletions bin/report-code-coverage.sh

This file was deleted.

11 changes: 5 additions & 6 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,14 +35,13 @@
"require-dev": {
"phpmd/phpmd": "2.15.0",
"brain/monkey": "2.6.1",
"friendsofphp/php-cs-fixer": "2.19.3",
"friendsofphp/php-cs-fixer": "3.62.0",
"php-cs-fixer/phpunit-constraint-isidenticalstring": "1.5.0",
"php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "1.5.0",
"sebastian/comparator": "4.0.8",
"phpcompatibility/php-compatibility": "9.3.5",
"yoast/phpunit-polyfills": "1.1.0",
"phpcompatibility/phpcompatibility-wp": "2.1.4",
"wp-coding-standards/wpcs": "3.0.1",
"phpunit/phpunit": "9.6.16"
"yoast/phpunit-polyfills": "1.1.1",
"phpcompatibility/phpcompatibility-wp": "2.1.5",
"wp-coding-standards/wpcs": "3.1.0",
"phpunit/phpunit": "9.6.20"
}
}
Loading