From 96d6d8b54f0b945ed29be068ddcdf059f041dc2b Mon Sep 17 00:00:00 2001 From: Tigrov Date: Sat, 27 Jul 2024 10:41:32 +0700 Subject: [PATCH 1/2] Update workflows --- .github/workflows/ansi-mode.yml | 33 +++++++++---------- .github/workflows/build-mariadb.yml | 30 ++++++++--------- .github/workflows/build.yml | 30 ++++++++--------- .../workflows/composer-require-checker.yml | 28 ++++++---------- .github/workflows/mutation.yml | 25 ++++++-------- .github/workflows/rector.yml | 25 ++++---------- .github/workflows/static.yml | 27 +++++++-------- 7 files changed, 80 insertions(+), 118 deletions(-) diff --git a/.github/workflows/ansi-mode.yml b/.github/workflows/ansi-mode.yml index 860ef7039..d7d85bb81 100644 --- a/.github/workflows/ansi-mode.yml +++ b/.github/workflows/ansi-mode.yml @@ -1,23 +1,20 @@ on: pull_request: - paths-ignore: - - 'docs/**' - - 'README.md' - - 'CHANGELOG.md' - - '.gitignore' - - '.gitattributes' - - 'infection.json.dist' - - 'psalm.xml' + paths: + - 'src/**' + - 'tests/**' + - '.github/workflows/ansi-mode.yml' + - 'composer.json' + - 'phpunit.xml.dist' push: - paths-ignore: - - 'docs/**' - - 'README.md' - - 'CHANGELOG.md' - - '.gitignore' - - '.gitattributes' - - 'infection.json.dist' - - 'psalm.xml' + branches: ['master'] + paths: + - 'src/**' + - 'tests/**' + - '.github/workflows/ansi-mode.yml' + - 'composer.json' + - 'phpunit.xml.dist' name: ansi-mode @@ -37,10 +34,10 @@ jobs: - ubuntu-latest php: - - 8.0 + - 8.3 mysql: - - mysql:8.0.29 + - mysql:latest services: mysql: diff --git a/.github/workflows/build-mariadb.yml b/.github/workflows/build-mariadb.yml index 82c3cb950..4356fb048 100644 --- a/.github/workflows/build-mariadb.yml +++ b/.github/workflows/build-mariadb.yml @@ -1,23 +1,20 @@ on: pull_request: - paths-ignore: - - 'docs/**' - - 'README.md' - - 'CHANGELOG.md' - - '.gitignore' - - '.gitattributes' - - 'infection.json.dist' - - 'psalm.xml' + paths: + - 'src/**' + - 'tests/**' + - '.github/workflows/build-mariadb.yml' + - 'composer.json' + - 'phpunit.xml.dist' push: - paths-ignore: - - 'docs/**' - - 'README.md' - - 'CHANGELOG.md' - - '.gitignore' - - '.gitattributes' - - 'infection.json.dist' - - 'psalm.xml' + branches: ['master'] + paths: + - 'src/**' + - 'tests/**' + - '.github/workflows/build-mariadb.yml' + - 'composer.json' + - 'phpunit.xml.dist' name: build-mariadb @@ -40,6 +37,7 @@ jobs: - 8.0 - 8.1 - 8.2 + - 8.3 mariadb: - mariadb:10.4 diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5c9030fe2..3bf72adf0 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,23 +1,20 @@ on: pull_request: - paths-ignore: - - 'docs/**' - - 'README.md' - - 'CHANGELOG.md' - - '.gitignore' - - '.gitattributes' - - 'infection.json.dist' - - 'psalm.xml' + paths: + - 'src/**' + - 'tests/**' + - '.github/workflows/build.yml' + - 'composer.json' + - 'phpunit.xml.dist' push: - paths-ignore: - - 'docs/**' - - 'README.md' - - 'CHANGELOG.md' - - '.gitignore' - - '.gitattributes' - - 'infection.json.dist' - - 'psalm.xml' + branches: ['master'] + paths: + - 'src/**' + - 'tests/**' + - '.github/workflows/build.yml' + - 'composer.json' + - 'phpunit.xml.dist' name: build @@ -40,6 +37,7 @@ jobs: - 8.0 - 8.1 - 8.2 + - 8.3 mysql: - mysql:5.7 diff --git a/.github/workflows/composer-require-checker.yml b/.github/workflows/composer-require-checker.yml index fb9dfd55d..58107cb71 100644 --- a/.github/workflows/composer-require-checker.yml +++ b/.github/workflows/composer-require-checker.yml @@ -1,25 +1,16 @@ on: pull_request: - paths-ignore: - - 'docs/**' - - 'README.md' - - 'CHANGELOG.md' - - '.gitignore' - - '.gitattributes' - - 'infection.json.dist' - - 'phpunit.xml.dist' - - 'psalm.xml' + paths: + - 'src/**' + - '.github/workflows/composer-require-checker.yml' + - 'composer.json' push: - paths-ignore: - - 'docs/**' - - 'README.md' - - 'CHANGELOG.md' - - '.gitignore' - - '.gitattributes' - - 'infection.json.dist' - - 'phpunit.xml.dist' - - 'psalm.xml' + branches: ['master'] + paths: + - 'src/**' + - '.github/workflows/composer-require-checker.yml' + - 'composer.json' name: Composer require checker @@ -41,6 +32,7 @@ jobs: - 8.0 - 8.1 - 8.2 + - 8.3 steps: - name: Checkout. diff --git a/.github/workflows/mutation.yml b/.github/workflows/mutation.yml index 12490764a..b6683a09c 100644 --- a/.github/workflows/mutation.yml +++ b/.github/workflows/mutation.yml @@ -1,21 +1,16 @@ on: pull_request: - paths-ignore: - - 'docs/**' - - 'README.md' - - 'CHANGELOG.md' - - '.gitignore' - - '.gitattributes' - - 'psalm.xml' + paths: + - 'src/**' + - '.github/workflows/mutation.yml' + - 'composer.json' push: - paths-ignore: - - 'docs/**' - - 'README.md' - - 'CHANGELOG.md' - - '.gitignore' - - '.gitattributes' - - 'psalm.xml' + branches: ['master'] + paths: + - 'src/**' + - '.github/workflows/mutation.yml' + - 'composer.json' name: mutation @@ -35,7 +30,7 @@ jobs: - ubuntu-latest php: - - 8.1 + - 8.3 services: mysql: diff --git a/.github/workflows/rector.yml b/.github/workflows/rector.yml index e21dd376a..edce19b28 100644 --- a/.github/workflows/rector.yml +++ b/.github/workflows/rector.yml @@ -1,23 +1,10 @@ on: pull_request: - paths-ignore: - - 'docs/**' - - 'README.md' - - 'CHANGELOG.md' - - '.gitignore' - - '.gitattributes' - - 'infection.json.dist' - - 'psalm.xml' - - push: - paths-ignore: - - 'docs/**' - - 'README.md' - - 'CHANGELOG.md' - - '.gitignore' - - '.gitattributes' - - 'infection.json.dist' - - 'psalm.xml' + paths: + - 'src/**' + - '.github/workflows/rector.yml' + - 'composer.json' + - 'rector.php' name: rector @@ -28,4 +15,4 @@ jobs: os: >- ['ubuntu-latest'] php: >- - ['8.0'] + ['8.3'] diff --git a/.github/workflows/static.yml b/.github/workflows/static.yml index b77787984..1660a1ad9 100644 --- a/.github/workflows/static.yml +++ b/.github/workflows/static.yml @@ -1,23 +1,18 @@ on: pull_request: - paths-ignore: - - 'docs/**' - - 'README.md' - - 'CHANGELOG.md' - - '.gitignore' - - '.gitattributes' - - 'infection.json.dist' - - 'phpunit.xml.dist' + paths: + - 'src/**' + - '.github/workflows/static.yml' + - 'psalm*.xml' + - 'composer.json' push: - paths-ignore: - - 'docs/**' - - 'README.md' - - 'CHANGELOG.md' - - '.gitignore' - - '.gitattributes' - - 'infection.json.dist' - - 'phpunit.xml.dist' + branches: ['master'] + paths: + - 'src/**' + - '.github/workflows/static.yml' + - 'psalm*.xml' + - 'composer.json' name: static analysis From fa00095b5c536f616791a4ccf255c2f0dfde695e Mon Sep 17 00:00:00 2001 From: Tigrov Date: Sat, 27 Jul 2024 21:31:10 +0700 Subject: [PATCH 2/2] Exclude old version for old PHP --- .github/workflows/build-mariadb.yml | 16 +++++++++------- .github/workflows/build.yml | 16 +++++++++------- 2 files changed, 18 insertions(+), 14 deletions(-) diff --git a/.github/workflows/build-mariadb.yml b/.github/workflows/build-mariadb.yml index 4356fb048..4228ded69 100644 --- a/.github/workflows/build-mariadb.yml +++ b/.github/workflows/build-mariadb.yml @@ -26,17 +26,11 @@ jobs: COMPOSER_ROOT_VERSION: 1.0.0 EXTENSIONS: pdo, pdo_mysql - runs-on: ${{ matrix.os }} + runs-on: ubuntu-latest strategy: matrix: - os: - - ubuntu-latest - php: - - 8.0 - - 8.1 - - 8.2 - 8.3 mariadb: @@ -48,6 +42,14 @@ jobs: - mariadb:10.9 - mariadb:latest + include: + - php: 8.0 + mariadb: mariadb:latest + - php: 8.1 + mariadb: mariadb:latest + - php: 8.2 + mariadb: mariadb:latest + services: mysql: image: ${{ matrix.mariadb }} diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3bf72adf0..148789181 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -26,23 +26,25 @@ jobs: COMPOSER_ROOT_VERSION: 1.0.0 EXTENSIONS: pdo, pdo_mysql - runs-on: ${{ matrix.os }} + runs-on: ubuntu-latest strategy: matrix: - os: - - ubuntu-latest - php: - - 8.0 - - 8.1 - - 8.2 - 8.3 mysql: - mysql:5.7 - mysql:latest + include: + - php: 8.0 + mysql: mysql:latest + - php: 8.1 + mysql: mysql:latest + - php: 8.2 + mysql: mysql:latest + services: mysql: image: ${{ matrix.mysql }}