From e9619b3640545352d6c4a1c518bde50fca062c4c Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 7 Jun 2024 12:08:39 +0900 Subject: [PATCH 1/4] Add branch for CI 4.5 --- .github/workflows/phpcsfixer.yml | 2 +- .github/workflows/phpstan.yml | 2 +- .github/workflows/phpunit-lowest.yml | 2 +- .github/workflows/phpunit-no-db.yml | 2 +- .github/workflows/phpunit.yml | 10 +++++----- .github/workflows/rector.yml | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/phpcsfixer.yml b/.github/workflows/phpcsfixer.yml index 92c0745..411a681 100644 --- a/.github/workflows/phpcsfixer.yml +++ b/.github/workflows/phpcsfixer.yml @@ -30,7 +30,7 @@ jobs: strategy: fail-fast: false matrix: - php-versions: ['7.4', '8.3'] + php-versions: ['8.1', '8.3'] steps: - name: Checkout diff --git a/.github/workflows/phpstan.yml b/.github/workflows/phpstan.yml index 70a5f0d..cad942f 100644 --- a/.github/workflows/phpstan.yml +++ b/.github/workflows/phpstan.yml @@ -34,7 +34,7 @@ jobs: strategy: fail-fast: false matrix: - php-versions: ['7.4', '8.0', '8.1', '8.2', '8.3'] + php-versions: ['8.1', '8.2', '8.3'] steps: - name: Checkout diff --git a/.github/workflows/phpunit-lowest.yml b/.github/workflows/phpunit-lowest.yml index 41c3610..2cf9270 100644 --- a/.github/workflows/phpunit-lowest.yml +++ b/.github/workflows/phpunit-lowest.yml @@ -34,7 +34,7 @@ jobs: if: "!contains(github.event.head_commit.message, '[ci skip]')" strategy: matrix: - php-versions: ['7.4'] + php-versions: ['8.1'] db-platforms: ['MySQLi'] mysql-versions: ['5.7'] dependencies: ['lowest'] diff --git a/.github/workflows/phpunit-no-db.yml b/.github/workflows/phpunit-no-db.yml index 770a181..1f68e1a 100644 --- a/.github/workflows/phpunit-no-db.yml +++ b/.github/workflows/phpunit-no-db.yml @@ -34,7 +34,7 @@ jobs: if: "!contains(github.event.head_commit.message, '[ci skip]')" strategy: matrix: - php-versions: ['7.4', '8.0', '8.1', '8.2', '8.3'] + php-versions: ['8.1', '8.2', '8.3'] dependencies: ['highest', 'lowest'] steps: diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml index 97e8aa0..3fc507f 100644 --- a/.github/workflows/phpunit.yml +++ b/.github/workflows/phpunit.yml @@ -40,25 +40,25 @@ jobs: if: "!contains(github.event.head_commit.message, '[ci skip]')" strategy: matrix: - php-versions: ['7.4', '8.0', '8.1', '8.2', '8.3'] + php-versions: ['8.1', '8.2', '8.3'] db-platforms: ['MySQLi', 'SQLite3'] mysql-versions: ['8.0'] dependencies: ['highest'] include: # MySQL 5.7 - - php-versions: '7.4' + - php-versions: '8.1' db-platforms: MySQLi mysql-versions: '5.7' # Postgre - - php-versions: '7.4' + - php-versions: '8.1' db-platforms: Postgre mysql-versions: '8.0' # SQLSRV - - php-versions: '7.4' + - php-versions: '8.1' db-platforms: SQLSRV mysql-versions: '8.0' # OCI8 - - php-versions: '7.4' + - php-versions: '8.1' db-platforms: OCI8 mysql-versions: '8.0' diff --git a/.github/workflows/rector.yml b/.github/workflows/rector.yml index 788b901..366b297 100644 --- a/.github/workflows/rector.yml +++ b/.github/workflows/rector.yml @@ -34,7 +34,7 @@ jobs: strategy: fail-fast: false matrix: - php-versions: ['7.4', '8.3'] + php-versions: ['8.1', '8.3'] steps: - name: Checkout From 41b6bf0a8c265025a59f90624fb1c93b6c5f5f4d Mon Sep 17 00:00:00 2001 From: michalsn Date: Thu, 23 Jan 2025 09:53:06 +0100 Subject: [PATCH 2/4] refactor: fix warnings on VSCode --- .github/workflows/deptrac.yml | 2 +- .github/workflows/infection.yml | 2 +- .github/workflows/phpcpd.yml | 2 +- .github/workflows/phpcsfixer.yml | 2 +- .github/workflows/phpstan.yml | 2 +- .github/workflows/phpunit-lowest.yml | 2 +- .github/workflows/phpunit-no-db.yml | 2 +- .github/workflows/phpunit.yml | 2 +- .github/workflows/psalm.yml | 2 +- .github/workflows/rector.yml | 2 +- .github/workflows/unused.yml | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/deptrac.yml b/.github/workflows/deptrac.yml index 3219ebd..4ba8d2f 100644 --- a/.github/workflows/deptrac.yml +++ b/.github/workflows/deptrac.yml @@ -30,7 +30,7 @@ jobs: build: name: Dependency Tracing runs-on: ubuntu-latest - if: "!contains(github.event.head_commit.message, '[ci skip]')" + if: (! contains(github.event.head_commit.message, '[ci skip]')) steps: - name: Checkout diff --git a/.github/workflows/infection.yml b/.github/workflows/infection.yml index bff4c62..8039c1f 100644 --- a/.github/workflows/infection.yml +++ b/.github/workflows/infection.yml @@ -22,7 +22,7 @@ jobs: main: name: Mutation Testing runs-on: ubuntu-latest - if: "!contains(github.event.head_commit.message, '[ci skip]')" + if: (! contains(github.event.head_commit.message, '[ci skip]')) steps: - name: Checkout diff --git a/.github/workflows/phpcpd.yml b/.github/workflows/phpcpd.yml index acef839..19f140c 100644 --- a/.github/workflows/phpcpd.yml +++ b/.github/workflows/phpcpd.yml @@ -35,7 +35,7 @@ jobs: build: name: Code Copy-Paste Detection runs-on: ubuntu-latest - if: "!contains(github.event.head_commit.message, '[ci skip]')" + if: (! contains(github.event.head_commit.message, '[ci skip]')) steps: - name: Checkout diff --git a/.github/workflows/phpcsfixer.yml b/.github/workflows/phpcsfixer.yml index 411a681..bbec8b3 100644 --- a/.github/workflows/phpcsfixer.yml +++ b/.github/workflows/phpcsfixer.yml @@ -26,7 +26,7 @@ jobs: build: name: PHP ${{ matrix.php-versions }} Coding Standards runs-on: ubuntu-latest - if: "!contains(github.event.head_commit.message, '[ci skip]')" + if: (! contains(github.event.head_commit.message, '[ci skip]')) strategy: fail-fast: false matrix: diff --git a/.github/workflows/phpstan.yml b/.github/workflows/phpstan.yml index cad942f..76802da 100644 --- a/.github/workflows/phpstan.yml +++ b/.github/workflows/phpstan.yml @@ -30,7 +30,7 @@ jobs: build: name: PHP ${{ matrix.php-versions }} Static Analysis runs-on: ubuntu-latest - if: "!contains(github.event.head_commit.message, '[ci skip]')" + if: (! contains(github.event.head_commit.message, '[ci skip]')) strategy: fail-fast: false matrix: diff --git a/.github/workflows/phpunit-lowest.yml b/.github/workflows/phpunit-lowest.yml index 2cf9270..0fa6b29 100644 --- a/.github/workflows/phpunit-lowest.yml +++ b/.github/workflows/phpunit-lowest.yml @@ -31,7 +31,7 @@ jobs: main: name: PHP ${{ matrix.php-versions }} - ${{ matrix.db-platforms }} - ${{ matrix.dependencies }} runs-on: ubuntu-latest - if: "!contains(github.event.head_commit.message, '[ci skip]')" + if: (! contains(github.event.head_commit.message, '[ci skip]')) strategy: matrix: php-versions: ['8.1'] diff --git a/.github/workflows/phpunit-no-db.yml b/.github/workflows/phpunit-no-db.yml index 1f68e1a..b63a337 100644 --- a/.github/workflows/phpunit-no-db.yml +++ b/.github/workflows/phpunit-no-db.yml @@ -31,7 +31,7 @@ jobs: main: name: PHP ${{ matrix.php-versions }} Unit Tests runs-on: ubuntu-latest - if: "!contains(github.event.head_commit.message, '[ci skip]')" + if: (! contains(github.event.head_commit.message, '[ci skip]')) strategy: matrix: php-versions: ['8.1', '8.2', '8.3'] diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml index 3fc507f..a023012 100644 --- a/.github/workflows/phpunit.yml +++ b/.github/workflows/phpunit.yml @@ -37,7 +37,7 @@ jobs: main: name: PHP ${{ matrix.php-versions }} - ${{ matrix.db-platforms }} runs-on: ubuntu-latest - if: "!contains(github.event.head_commit.message, '[ci skip]')" + if: (! contains(github.event.head_commit.message, '[ci skip]')) strategy: matrix: php-versions: ['8.1', '8.2', '8.3'] diff --git a/.github/workflows/psalm.yml b/.github/workflows/psalm.yml index c39c650..201ddd5 100644 --- a/.github/workflows/psalm.yml +++ b/.github/workflows/psalm.yml @@ -30,7 +30,7 @@ jobs: build: name: Psalm Analysis runs-on: ubuntu-latest - if: "!contains(github.event.head_commit.message, '[ci skip]')" + if: (! contains(github.event.head_commit.message, '[ci skip]')) steps: - name: Checkout diff --git a/.github/workflows/rector.yml b/.github/workflows/rector.yml index 366b297..0d1dab1 100644 --- a/.github/workflows/rector.yml +++ b/.github/workflows/rector.yml @@ -30,7 +30,7 @@ jobs: build: name: PHP ${{ matrix.php-versions }} Rector Analysis runs-on: ubuntu-latest - if: "!contains(github.event.head_commit.message, '[ci skip]')" + if: (! contains(github.event.head_commit.message, '[ci skip]')) strategy: fail-fast: false matrix: diff --git a/.github/workflows/unused.yml b/.github/workflows/unused.yml index 2b85d16..9abd1ca 100644 --- a/.github/workflows/unused.yml +++ b/.github/workflows/unused.yml @@ -28,7 +28,7 @@ jobs: build: name: Unused Package Detection runs-on: ubuntu-latest - if: "!contains(github.event.head_commit.message, '[ci skip]')" + if: (! contains(github.event.head_commit.message, '[ci skip]')) steps: - name: Checkout From 3a17d0bac23f97596b03a37d8941b6b5d7c10924 Mon Sep 17 00:00:00 2001 From: michalsn Date: Thu, 23 Jan 2025 09:57:33 +0100 Subject: [PATCH 3/4] align service versions with the main branch --- .github/workflows/phpunit.yml | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml index a023012..3dab417 100644 --- a/.github/workflows/phpunit.yml +++ b/.github/workflows/phpunit.yml @@ -36,7 +36,7 @@ env: jobs: main: name: PHP ${{ matrix.php-versions }} - ${{ matrix.db-platforms }} - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 if: (! contains(github.event.head_commit.message, '[ci skip]')) strategy: matrix: @@ -83,17 +83,21 @@ jobs: options: --health-cmd=pg_isready --health-interval=10s --health-timeout=5s --health-retries=3 mssql: - image: mcr.microsoft.com/mssql/server:2019-CU10-ubuntu-20.04 + image: mcr.microsoft.com/mssql/server:2022-latest env: - SA_PASSWORD: 1Secure*Password1 + MSSQL_SA_PASSWORD: 1Secure*Password1 ACCEPT_EULA: Y MSSQL_PID: Developer ports: - 1433:1433 - options: --health-cmd="/opt/mssql-tools/bin/sqlcmd -S 127.0.0.1 -U sa -P 1Secure*Password1 -Q 'SELECT @@VERSION'" --health-interval=10s --health-timeout=5s --health-retries=3 + options: >- + --health-cmd="/opt/mssql-tools18/bin/sqlcmd -C -S 127.0.0.1 -U sa -P 1Secure*Password1 -Q 'SELECT @@VERSION'" + --health-interval=10s + --health-timeout=5s + --health-retries=3 oracle: - image: gvenzl/oracle-xe:18 + image: gvenzl/oracle-xe:21 env: ORACLE_RANDOM_PASSWORD: true APP_USER: ORACLE From 67beda89059e6a20d7bd198e063c0b7430f5b9b9 Mon Sep 17 00:00:00 2001 From: michalsn Date: Thu, 23 Jan 2025 09:57:41 +0100 Subject: [PATCH 4/4] fix: infection workflow --- .github/workflows/infection.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/infection.yml b/.github/workflows/infection.yml index 8039c1f..61947ee 100644 --- a/.github/workflows/infection.yml +++ b/.github/workflows/infection.yml @@ -31,7 +31,7 @@ jobs: - name: Set up PHP uses: shivammathur/setup-php@v2 with: - php-version: '8.1' + php-version: '8.2' tools: infection, phpunit extensions: intl, json, mbstring, gd, xml, sqlite3 coverage: xdebug