From 9fd749d594bbd4a05626986293853469a1efee10 Mon Sep 17 00:00:00 2001 From: michalsn Date: Thu, 23 Jan 2025 13:34:32 +0100 Subject: [PATCH 01/16] Add branch for CI 4.6 --- .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 c48c83d..731c19c 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.4'] steps: - name: Checkout diff --git a/.github/workflows/phpstan.yml b/.github/workflows/phpstan.yml index d493d5f..997add4 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', '8.4'] steps: - name: Checkout diff --git a/.github/workflows/phpunit-lowest.yml b/.github/workflows/phpunit-lowest.yml index 01a7766..577cdcd 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 60e0df1..727fe7b 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', '8.4'] dependencies: ['highest', 'lowest'] steps: diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml index 813f718..7f2e987 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', '8.4'] 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 b8f188c..cefbc16 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.4'] steps: - name: Checkout From 603953b8fed756ebe6609093020d5b97fab64596 Mon Sep 17 00:00:00 2001 From: michalsn Date: Thu, 23 Jan 2025 14:15:11 +0100 Subject: [PATCH 02/16] add --ignore-platform-reqs flag for workflows that use PHP 8.4 - until Psalm supports it --- .github/workflows/phpcsfixer.yml | 9 +++++++-- .github/workflows/phpstan.yml | 9 +++++++-- .github/workflows/phpunit-no-db.yml | 9 +++++++-- .github/workflows/phpunit.yml | 9 +++++++-- .github/workflows/rector.yml | 9 +++++++-- 5 files changed, 35 insertions(+), 10 deletions(-) diff --git a/.github/workflows/phpcsfixer.yml b/.github/workflows/phpcsfixer.yml index 731c19c..07e1b07 100644 --- a/.github/workflows/phpcsfixer.yml +++ b/.github/workflows/phpcsfixer.yml @@ -57,10 +57,15 @@ jobs: - name: Install dependencies run: | + OPTIONS='--no-progress --no-interaction --prefer-dist --optimize-autoloader' + if [[ '${{ matrix.php-versions }}' == '8.4' ]]; then + OPTIONS="$OPTIONS --ignore-platform-reqs" + fi + if [ -f composer.lock ]; then - composer install --no-progress --no-interaction --prefer-dist --optimize-autoloader + composer install $OPTIONS else - composer update --no-progress --no-interaction --prefer-dist --optimize-autoloader + composer update $OPTIONS fi - name: Check code for standards compliance diff --git a/.github/workflows/phpstan.yml b/.github/workflows/phpstan.yml index 997add4..c4f653c 100644 --- a/.github/workflows/phpstan.yml +++ b/.github/workflows/phpstan.yml @@ -72,10 +72,15 @@ jobs: - name: Install dependencies run: | + OPTIONS='--no-progress --no-interaction --prefer-dist --optimize-autoloader' + if [[ '${{ matrix.php-versions }}' == '8.4' ]]; then + OPTIONS="$OPTIONS --ignore-platform-reqs" + fi + if [ -f composer.lock ]; then - composer install --no-progress --no-interaction --prefer-dist --optimize-autoloader + composer install $OPTIONS else - composer update --no-progress --no-interaction --prefer-dist --optimize-autoloader + composer update $OPTIONS fi - name: Run static analysis diff --git a/.github/workflows/phpunit-no-db.yml b/.github/workflows/phpunit-no-db.yml index 727fe7b..6688983 100644 --- a/.github/workflows/phpunit-no-db.yml +++ b/.github/workflows/phpunit-no-db.yml @@ -66,10 +66,15 @@ jobs: - name: Install dependencies run: | + OPTIONS="${{ env.COMPOSER_UPDATE_FLAGS }} --no-progress --no-interaction --prefer-dist --optimize-autoloader" + if [[ '${{ matrix.php-versions }}' == '8.4' ]]; then + OPTIONS="$OPTIONS --ignore-platform-reqs" + fi + if [ -f composer.lock ]; then - composer install ${{ env.COMPOSER_UPDATE_FLAGS }} --no-progress --no-interaction --prefer-dist --optimize-autoloader + composer install $OPTIONS else - composer update ${{ env.COMPOSER_UPDATE_FLAGS }} --no-progress --no-interaction --prefer-dist --optimize-autoloader + composer update $OPTIONS fi env: COMPOSER_UPDATE_FLAGS: ${{ matrix.dependencies == 'lowest' && '--prefer-lowest' || '' }} diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml index 7f2e987..88863cc 100644 --- a/.github/workflows/phpunit.yml +++ b/.github/workflows/phpunit.yml @@ -156,10 +156,15 @@ jobs: - name: Install dependencies run: | + OPTIONS="${{ env.COMPOSER_UPDATE_FLAGS }} --no-progress --no-interaction --prefer-dist --optimize-autoloader" + if [[ '${{ matrix.php-versions }}' == '8.4' ]]; then + OPTIONS="$OPTIONS --ignore-platform-reqs" + fi + if [ -f composer.lock ]; then - composer install ${{ env.COMPOSER_UPDATE_FLAGS }} --no-progress --no-interaction --prefer-dist --optimize-autoloader + composer install $OPTIONS else - composer update ${{ env.COMPOSER_UPDATE_FLAGS }} --no-progress --no-interaction --prefer-dist --optimize-autoloader + composer update $OPTIONS fi env: COMPOSER_UPDATE_FLAGS: ${{ matrix.dependencies == 'lowest' && '--prefer-lowest' || '' }} diff --git a/.github/workflows/rector.yml b/.github/workflows/rector.yml index cefbc16..f3f0215 100644 --- a/.github/workflows/rector.yml +++ b/.github/workflows/rector.yml @@ -62,10 +62,15 @@ jobs: - name: Install dependencies run: | + OPTIONS='--no-progress --no-interaction --prefer-dist --optimize-autoloader' + if [[ '${{ matrix.php-versions }}' == '8.4' ]]; then + OPTIONS="$OPTIONS --ignore-platform-reqs" + fi + if [ -f composer.lock ]; then - composer install --no-progress --no-interaction --prefer-dist --optimize-autoloader + composer install $OPTIONS else - composer update --no-progress --no-interaction --prefer-dist --optimize-autoloader + composer update $OPTIONS fi - name: Analyze for refactoring From 04bd3a8e04b1f7dd10e263efacbd884661da3f02 Mon Sep 17 00:00:00 2001 From: michalsn Date: Thu, 23 Jan 2025 14:49:32 +0100 Subject: [PATCH 03/16] cs-fixer is not yet ready for PHP 8.4 --- .github/workflows/phpcsfixer.yml | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/.github/workflows/phpcsfixer.yml b/.github/workflows/phpcsfixer.yml index 07e1b07..dfa0b67 100644 --- a/.github/workflows/phpcsfixer.yml +++ b/.github/workflows/phpcsfixer.yml @@ -30,7 +30,7 @@ jobs: strategy: fail-fast: false matrix: - php-versions: ['8.1', '8.4'] + php-versions: ['8.1', '8.3'] steps: - name: Checkout @@ -57,15 +57,10 @@ jobs: - name: Install dependencies run: | - OPTIONS='--no-progress --no-interaction --prefer-dist --optimize-autoloader' - if [[ '${{ matrix.php-versions }}' == '8.4' ]]; then - OPTIONS="$OPTIONS --ignore-platform-reqs" - fi - if [ -f composer.lock ]; then - composer install $OPTIONS + composer install --no-progress --no-interaction --prefer-dist --optimize-autoloader else - composer update $OPTIONS + composer update --no-progress --no-interaction --prefer-dist --optimize-autoloader fi - name: Check code for standards compliance From 6942bea02cc73227cc58e3500d1635e86999b492 Mon Sep 17 00:00:00 2001 From: michalsn Date: Fri, 24 Jan 2025 09:32:13 +0100 Subject: [PATCH 04/16] use PHP 8.4 in cs-fixer but with a flag PHP_CS_FIXER_IGNORE_ENV --- .github/workflows/phpcsfixer.yml | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/.github/workflows/phpcsfixer.yml b/.github/workflows/phpcsfixer.yml index dfa0b67..a184fe3 100644 --- a/.github/workflows/phpcsfixer.yml +++ b/.github/workflows/phpcsfixer.yml @@ -30,7 +30,7 @@ jobs: strategy: fail-fast: false matrix: - php-versions: ['8.1', '8.3'] + php-versions: ['8.1', '8.4'] steps: - name: Checkout @@ -57,11 +57,18 @@ jobs: - name: Install dependencies run: | + OPTIONS='--no-progress --no-interaction --prefer-dist --optimize-autoloader' + if [[ '${{ matrix.php-versions }}' == '8.4' ]]; then + OPTIONS="$OPTIONS --ignore-platform-reqs" + fi + if [ -f composer.lock ]; then - composer install --no-progress --no-interaction --prefer-dist --optimize-autoloader + composer install $OPTIONS else - composer update --no-progress --no-interaction --prefer-dist --optimize-autoloader + composer update $OPTIONS fi - name: Check code for standards compliance run: vendor/bin/php-cs-fixer fix --verbose --ansi --dry-run --using-cache=no --diff + env: + PHP_CS_FIXER_IGNORE_ENV: ${{ matrix.php-version == '8.4' }} From eace3cb5f7211653ded22a426db8a95f171cf6a2 Mon Sep 17 00:00:00 2001 From: michalsn Date: Fri, 24 Jan 2025 09:42:44 +0100 Subject: [PATCH 05/16] fix typo --- .github/workflows/phpcsfixer.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/phpcsfixer.yml b/.github/workflows/phpcsfixer.yml index a184fe3..57ab2ce 100644 --- a/.github/workflows/phpcsfixer.yml +++ b/.github/workflows/phpcsfixer.yml @@ -71,4 +71,4 @@ jobs: - name: Check code for standards compliance run: vendor/bin/php-cs-fixer fix --verbose --ansi --dry-run --using-cache=no --diff env: - PHP_CS_FIXER_IGNORE_ENV: ${{ matrix.php-version == '8.4' }} + PHP_CS_FIXER_IGNORE_ENV: ${{ matrix.php-versions == '8.4' }} From a0fb77837756cbb9ad1c8125038c6d3f3c658255 Mon Sep 17 00:00:00 2001 From: michalsn Date: Tue, 4 Feb 2025 15:22:20 +0100 Subject: [PATCH 06/16] update composer install/update for PHP 8.4 --- .github/workflows/phpcsfixer.yml | 9 ++------- .github/workflows/phpstan.yml | 9 ++------- .github/workflows/phpunit-no-db.yml | 9 ++------- .github/workflows/phpunit.yml | 9 ++------- .github/workflows/rector.yml | 9 ++------- 5 files changed, 10 insertions(+), 35 deletions(-) diff --git a/.github/workflows/phpcsfixer.yml b/.github/workflows/phpcsfixer.yml index 57ab2ce..2ef446e 100644 --- a/.github/workflows/phpcsfixer.yml +++ b/.github/workflows/phpcsfixer.yml @@ -57,15 +57,10 @@ jobs: - name: Install dependencies run: | - OPTIONS='--no-progress --no-interaction --prefer-dist --optimize-autoloader' - if [[ '${{ matrix.php-versions }}' == '8.4' ]]; then - OPTIONS="$OPTIONS --ignore-platform-reqs" - fi - if [ -f composer.lock ]; then - composer install $OPTIONS + composer install --no-progress --no-interaction --prefer-dist --optimize-autoloader else - composer update $OPTIONS + composer update --no-progress --no-interaction --prefer-dist --optimize-autoloader fi - name: Check code for standards compliance diff --git a/.github/workflows/phpstan.yml b/.github/workflows/phpstan.yml index c4f653c..997add4 100644 --- a/.github/workflows/phpstan.yml +++ b/.github/workflows/phpstan.yml @@ -72,15 +72,10 @@ jobs: - name: Install dependencies run: | - OPTIONS='--no-progress --no-interaction --prefer-dist --optimize-autoloader' - if [[ '${{ matrix.php-versions }}' == '8.4' ]]; then - OPTIONS="$OPTIONS --ignore-platform-reqs" - fi - if [ -f composer.lock ]; then - composer install $OPTIONS + composer install --no-progress --no-interaction --prefer-dist --optimize-autoloader else - composer update $OPTIONS + composer update --no-progress --no-interaction --prefer-dist --optimize-autoloader fi - name: Run static analysis diff --git a/.github/workflows/phpunit-no-db.yml b/.github/workflows/phpunit-no-db.yml index 6688983..727fe7b 100644 --- a/.github/workflows/phpunit-no-db.yml +++ b/.github/workflows/phpunit-no-db.yml @@ -66,15 +66,10 @@ jobs: - name: Install dependencies run: | - OPTIONS="${{ env.COMPOSER_UPDATE_FLAGS }} --no-progress --no-interaction --prefer-dist --optimize-autoloader" - if [[ '${{ matrix.php-versions }}' == '8.4' ]]; then - OPTIONS="$OPTIONS --ignore-platform-reqs" - fi - if [ -f composer.lock ]; then - composer install $OPTIONS + composer install ${{ env.COMPOSER_UPDATE_FLAGS }} --no-progress --no-interaction --prefer-dist --optimize-autoloader else - composer update $OPTIONS + composer update ${{ env.COMPOSER_UPDATE_FLAGS }} --no-progress --no-interaction --prefer-dist --optimize-autoloader fi env: COMPOSER_UPDATE_FLAGS: ${{ matrix.dependencies == 'lowest' && '--prefer-lowest' || '' }} diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml index 88863cc..7f2e987 100644 --- a/.github/workflows/phpunit.yml +++ b/.github/workflows/phpunit.yml @@ -156,15 +156,10 @@ jobs: - name: Install dependencies run: | - OPTIONS="${{ env.COMPOSER_UPDATE_FLAGS }} --no-progress --no-interaction --prefer-dist --optimize-autoloader" - if [[ '${{ matrix.php-versions }}' == '8.4' ]]; then - OPTIONS="$OPTIONS --ignore-platform-reqs" - fi - if [ -f composer.lock ]; then - composer install $OPTIONS + composer install ${{ env.COMPOSER_UPDATE_FLAGS }} --no-progress --no-interaction --prefer-dist --optimize-autoloader else - composer update $OPTIONS + composer update ${{ env.COMPOSER_UPDATE_FLAGS }} --no-progress --no-interaction --prefer-dist --optimize-autoloader fi env: COMPOSER_UPDATE_FLAGS: ${{ matrix.dependencies == 'lowest' && '--prefer-lowest' || '' }} diff --git a/.github/workflows/rector.yml b/.github/workflows/rector.yml index f3f0215..cefbc16 100644 --- a/.github/workflows/rector.yml +++ b/.github/workflows/rector.yml @@ -62,15 +62,10 @@ jobs: - name: Install dependencies run: | - OPTIONS='--no-progress --no-interaction --prefer-dist --optimize-autoloader' - if [[ '${{ matrix.php-versions }}' == '8.4' ]]; then - OPTIONS="$OPTIONS --ignore-platform-reqs" - fi - if [ -f composer.lock ]; then - composer install $OPTIONS + composer install --no-progress --no-interaction --prefer-dist --optimize-autoloader else - composer update $OPTIONS + composer update --no-progress --no-interaction --prefer-dist --optimize-autoloader fi - name: Analyze for refactoring From 23f2ff9516ba4adf8ccab6c4de83c51a2ac5a40a Mon Sep 17 00:00:00 2001 From: michalsn Date: Wed, 5 Feb 2025 09:06:31 +0100 Subject: [PATCH 07/16] remove verbose flag from PHPUnit workflow --- .github/workflows/phpunit-lowest.yml | 2 +- .github/workflows/phpunit-no-db.yml | 2 +- .github/workflows/phpunit.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/phpunit-lowest.yml b/.github/workflows/phpunit-lowest.yml index 577cdcd..13247fb 100644 --- a/.github/workflows/phpunit-lowest.yml +++ b/.github/workflows/phpunit-lowest.yml @@ -87,7 +87,7 @@ jobs: COMPOSER_UPDATE_FLAGS: ${{ matrix.dependencies == 'lowest' && '--prefer-lowest' || '' }} - name: Test with PHPUnit - run: vendor/bin/phpunit --verbose --coverage-text --testsuite main + run: vendor/bin/phpunit --coverage-text --testsuite main env: DB: ${{ matrix.db-platforms }} TERM: xterm-256color diff --git a/.github/workflows/phpunit-no-db.yml b/.github/workflows/phpunit-no-db.yml index 727fe7b..8847b5b 100644 --- a/.github/workflows/phpunit-no-db.yml +++ b/.github/workflows/phpunit-no-db.yml @@ -75,7 +75,7 @@ jobs: COMPOSER_UPDATE_FLAGS: ${{ matrix.dependencies == 'lowest' && '--prefer-lowest' || '' }} - name: Test with PHPUnit - run: vendor/bin/phpunit --verbose --coverage-text --testsuite main + run: vendor/bin/phpunit --coverage-text --testsuite main env: TERM: xterm-256color TACHYCARDIA_MONITOR_GA: enabled diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml index 7f2e987..985e15c 100644 --- a/.github/workflows/phpunit.yml +++ b/.github/workflows/phpunit.yml @@ -165,7 +165,7 @@ jobs: COMPOSER_UPDATE_FLAGS: ${{ matrix.dependencies == 'lowest' && '--prefer-lowest' || '' }} - name: Test with PHPUnit - run: vendor/bin/phpunit --verbose --coverage-text --testsuite main + run: vendor/bin/phpunit --coverage-text --testsuite main env: DB: ${{ matrix.db-platforms }} TERM: xterm-256color From 1a8f333b7aa068a13871627b9c2683de3dfb6826 Mon Sep 17 00:00:00 2001 From: michalsn Date: Thu, 27 Mar 2025 10:07:03 +0100 Subject: [PATCH 08/16] unused workflow require now PHP 8.2 --- .github/workflows/unused.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/unused.yml b/.github/workflows/unused.yml index f770a2b..94665d8 100644 --- a/.github/workflows/unused.yml +++ b/.github/workflows/unused.yml @@ -37,7 +37,7 @@ jobs: - name: Setup PHP uses: shivammathur/setup-php@v2 with: - php-version: '8.1' + php-version: '8.2' tools: composer, composer-unused extensions: intl, json, mbstring, xml coverage: none From 7bdb859f73def0fe6220697defe0cdc2fee7d448 Mon Sep 17 00:00:00 2001 From: michalsn Date: Sat, 12 Jul 2025 08:19:06 +0200 Subject: [PATCH 09/16] phpcsfixer - remove PHP_CS_FIXER_IGNORE_ENV --- .github/workflows/phpcsfixer.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/phpcsfixer.yml b/.github/workflows/phpcsfixer.yml index 2ef446e..731c19c 100644 --- a/.github/workflows/phpcsfixer.yml +++ b/.github/workflows/phpcsfixer.yml @@ -65,5 +65,3 @@ jobs: - name: Check code for standards compliance run: vendor/bin/php-cs-fixer fix --verbose --ansi --dry-run --using-cache=no --diff - env: - PHP_CS_FIXER_IGNORE_ENV: ${{ matrix.php-versions == '8.4' }} From bcc43f24b6bd7a620dd2bdf335f55fceade5f85c Mon Sep 17 00:00:00 2001 From: michalsn Date: Thu, 7 Aug 2025 09:21:53 +0200 Subject: [PATCH 10/16] feat: configurable workflows --- .github/workflows/deptrac.yml | 7 +++- .github/workflows/infection.yml | 7 +++- .github/workflows/phpcpd.yml | 6 ++- .github/workflows/phpcsfixer.yml | 13 +++--- .github/workflows/phpstan.yml | 13 +++--- .github/workflows/phpunit-lowest.yml | 36 ++++++++++++----- .github/workflows/phpunit-no-db.yml | 27 ++++++++----- .github/workflows/phpunit.yml | 60 ++++++++++++++-------------- .github/workflows/psalm.yml | 7 +++- .github/workflows/rector.yml | 13 +++--- .github/workflows/unused.yml | 7 +++- README.md | 32 +++++++++++++++ 12 files changed, 154 insertions(+), 74 deletions(-) diff --git a/.github/workflows/deptrac.yml b/.github/workflows/deptrac.yml index a46702a..95ac408 100644 --- a/.github/workflows/deptrac.yml +++ b/.github/workflows/deptrac.yml @@ -18,6 +18,11 @@ on: - 'deptrac.yaml' - '.github/workflows/deptrac.yml' workflow_call: + inputs: + php-version: + required: false + type: string + default: '8.1' concurrency: group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }} @@ -39,7 +44,7 @@ jobs: - name: Set up PHP uses: shivammathur/setup-php@v2 with: - php-version: '8.1' + php-version: ${{ inputs['php-version'] }} tools: composer extensions: intl, json, mbstring, xml coverage: none diff --git a/.github/workflows/infection.yml b/.github/workflows/infection.yml index f6a4ddd..4f46b2a 100644 --- a/.github/workflows/infection.yml +++ b/.github/workflows/infection.yml @@ -10,6 +10,11 @@ on: - 'phpunit*' - '.github/workflows/infection.yml' workflow_call: + inputs: + php-version: + required: false + type: string + default: '8.2' concurrency: group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }} @@ -31,7 +36,7 @@ jobs: - name: Set up PHP uses: shivammathur/setup-php@v2 with: - php-version: '8.2' + php-version: ${{ inputs['php-version'] }} tools: infection, phpunit extensions: intl, json, mbstring, gd, xml, sqlite3 coverage: xdebug diff --git a/.github/workflows/phpcpd.yml b/.github/workflows/phpcpd.yml index edd4540..9988aaa 100644 --- a/.github/workflows/phpcpd.yml +++ b/.github/workflows/phpcpd.yml @@ -23,6 +23,10 @@ on: description: Options to phpcpd required: false type: string + php-version: + required: false + type: string + default: '8.1' concurrency: group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }} @@ -44,7 +48,7 @@ jobs: - name: Setup PHP uses: shivammathur/setup-php@v2 with: - php-version: '8.1' + php-version: ${{ inputs['php-version'] }} tools: phpcpd extensions: dom, mbstring coverage: none diff --git a/.github/workflows/phpcsfixer.yml b/.github/workflows/phpcsfixer.yml index 731c19c..898d76e 100644 --- a/.github/workflows/phpcsfixer.yml +++ b/.github/workflows/phpcsfixer.yml @@ -14,6 +14,11 @@ on: - '**.php' - '.github/workflows/phpcsfixer.yml' workflow_call: + inputs: + php-version: + required: false + type: string + default: '8.1' concurrency: group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }} @@ -24,13 +29,9 @@ permissions: jobs: build: - name: PHP ${{ matrix.php-versions }} Coding Standards + name: PHP ${{ inputs['php-version'] }} Coding Standards runs-on: ubuntu-latest if: (! contains(github.event.head_commit.message, '[ci skip]')) - strategy: - fail-fast: false - matrix: - php-versions: ['8.1', '8.4'] steps: - name: Checkout @@ -39,7 +40,7 @@ jobs: - name: Set up PHP uses: shivammathur/setup-php@v2 with: - php-version: ${{ matrix.php-versions }} + php-version: ${{ inputs['php-version'] }} extensions: json, tokenizer coverage: none env: diff --git a/.github/workflows/phpstan.yml b/.github/workflows/phpstan.yml index 997add4..82966a4 100644 --- a/.github/workflows/phpstan.yml +++ b/.github/workflows/phpstan.yml @@ -18,6 +18,11 @@ on: - 'phpstan*' - '.github/workflows/phpstan.yml' workflow_call: + inputs: + php-version: + required: false + type: string + default: '8.1' concurrency: group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }} @@ -28,13 +33,9 @@ permissions: jobs: build: - name: PHP ${{ matrix.php-versions }} Static Analysis + name: PHP ${{ inputs['php-version'] }} Static Analysis runs-on: ubuntu-latest if: (! contains(github.event.head_commit.message, '[ci skip]')) - strategy: - fail-fast: false - matrix: - php-versions: ['8.1', '8.2', '8.3', '8.4'] steps: - name: Checkout @@ -43,7 +44,7 @@ jobs: - name: Setup PHP uses: shivammathur/setup-php@v2 with: - php-version: ${{ matrix.php-versions }} + php-version: ${{ inputs['php-version'] }} tools: phpstan, phpunit extensions: intl, json, mbstring, xml coverage: none diff --git a/.github/workflows/phpunit-lowest.yml b/.github/workflows/phpunit-lowest.yml index 13247fb..ac8643c 100644 --- a/.github/workflows/phpunit-lowest.yml +++ b/.github/workflows/phpunit-lowest.yml @@ -19,6 +19,26 @@ on: - 'phpunit*' - '.github/workflows/phpunit-lowest.yml' workflow_call: + php-version: + required: false + type: string + default: '8.1' + db-platform: + required: false + type: string + default: 'MySQLi' + mysql-version: + required: false + type: string + default: '5.7' + dependencies: + required: false + type: string + default: 'lowest' + coveralls-php: + required: false + type: string + default: '8.1' concurrency: group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }} @@ -29,19 +49,13 @@ permissions: jobs: main: - name: PHP ${{ matrix.php-versions }} - ${{ matrix.db-platforms }} - ${{ matrix.dependencies }} + name: PHP ${{ inputs['php-version'] }} - ${{ inputs['db-platform'] }} - ${{ inputs['dependencies'] }} runs-on: ubuntu-latest if: (! contains(github.event.head_commit.message, '[ci skip]')) - strategy: - matrix: - php-versions: ['8.1'] - db-platforms: ['MySQLi'] - mysql-versions: ['5.7'] - dependencies: ['lowest'] services: mysql: - image: mysql:${{ matrix.mysql-versions }} + image: mysql:${{ inputs['mysql-version'] }} env: MYSQL_ALLOW_EMPTY_PASSWORD: yes MYSQL_DATABASE: test @@ -59,7 +73,7 @@ jobs: - name: Set up PHP uses: shivammathur/setup-php@v2 with: - php-version: ${{ matrix.php-versions }} + php-version: ${{ inputs['php-version'] }} tools: composer, phive, phpunit extensions: intl, json, mbstring, gd, xdebug, xml, sqlite3 coverage: xdebug @@ -84,11 +98,11 @@ jobs: composer update ${{ env.COMPOSER_UPDATE_FLAGS }} --no-progress --no-interaction --prefer-dist --optimize-autoloader fi env: - COMPOSER_UPDATE_FLAGS: ${{ matrix.dependencies == 'lowest' && '--prefer-lowest' || '' }} + COMPOSER_UPDATE_FLAGS: ${{ inputs['dependencies'] == 'lowest' && '--prefer-lowest' || '' }} - name: Test with PHPUnit run: vendor/bin/phpunit --coverage-text --testsuite main env: - DB: ${{ matrix.db-platforms }} + DB: ${{ inputs['db-platform'] }} TERM: xterm-256color TACHYCARDIA_MONITOR_GA: enabled diff --git a/.github/workflows/phpunit-no-db.yml b/.github/workflows/phpunit-no-db.yml index 8847b5b..6d19a8f 100644 --- a/.github/workflows/phpunit-no-db.yml +++ b/.github/workflows/phpunit-no-db.yml @@ -19,6 +19,19 @@ on: - 'phpunit*' - '.github/workflows/phpunit-no-db.yml' workflow_call: + inputs: + php-version: + required: false + type: string + default: '8.1' + dependencies: + required: false + type: string + default: 'highest' + coveralls-php: + required: false + type: string + default: '8.1' concurrency: group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }} @@ -29,13 +42,9 @@ permissions: jobs: main: - name: PHP ${{ matrix.php-versions }} Unit Tests + name: PHP ${{ inputs['php-version'] }} Unit Tests runs-on: ubuntu-latest if: (! contains(github.event.head_commit.message, '[ci skip]')) - strategy: - matrix: - php-versions: ['8.1', '8.2', '8.3', '8.4'] - dependencies: ['highest', 'lowest'] steps: - name: Check disk space @@ -47,7 +56,7 @@ jobs: - name: Set up PHP uses: shivammathur/setup-php@v2 with: - php-version: ${{ matrix.php-versions }} + php-version: ${{ inputs['php-version'] }} tools: composer, phive, phpunit extensions: intl, json, mbstring, gd, xdebug, xml, sqlite3 coverage: xdebug @@ -72,7 +81,7 @@ jobs: composer update ${{ env.COMPOSER_UPDATE_FLAGS }} --no-progress --no-interaction --prefer-dist --optimize-autoloader fi env: - COMPOSER_UPDATE_FLAGS: ${{ matrix.dependencies == 'lowest' && '--prefer-lowest' || '' }} + COMPOSER_UPDATE_FLAGS: ${{ inputs['dependencies'] == 'lowest' && '--prefer-lowest' || '' }} - name: Test with PHPUnit run: vendor/bin/phpunit --coverage-text --testsuite main @@ -80,7 +89,7 @@ jobs: TERM: xterm-256color TACHYCARDIA_MONITOR_GA: enabled - - if: matrix.php-versions == '8.1' + - if: ${{ inputs['php-version'] == inputs['coveralls-php'] }} name: Run Coveralls continue-on-error: true run: | @@ -89,7 +98,7 @@ jobs: env: COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }} COVERALLS_PARALLEL: true - COVERALLS_FLAG_NAME: PHP ${{ matrix.php-versions }} + COVERALLS_FLAG_NAME: PHP ${{ inputs['php-version'] }} coveralls: needs: [main] diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml index 985e15c..62ae636 100644 --- a/.github/workflows/phpunit.yml +++ b/.github/workflows/phpunit.yml @@ -19,6 +19,27 @@ on: - 'phpunit*' - '.github/workflows/phpunit.yml' workflow_call: + inputs: + php-version: + required: false + type: string + default: '8.1' + db-platform: + required: false + type: string + default: 'MySQLi' + mysql-version: + required: false + type: string + default: '8.0' + dependencies: + required: false + type: string + default: 'highest' + coveralls-php: + required: false + type: string + default: '8.1' concurrency: group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }} @@ -35,36 +56,13 @@ env: jobs: main: - name: PHP ${{ matrix.php-versions }} - ${{ matrix.db-platforms }} + name: PHP ${{ inputs['php-version'] }} - ${{ inputs['db-platform'] }} runs-on: ubuntu-22.04 if: (! contains(github.event.head_commit.message, '[ci skip]')) - strategy: - matrix: - php-versions: ['8.1', '8.2', '8.3', '8.4'] - db-platforms: ['MySQLi', 'SQLite3'] - mysql-versions: ['8.0'] - dependencies: ['highest'] - include: - # MySQL 5.7 - - php-versions: '8.1' - db-platforms: MySQLi - mysql-versions: '5.7' - # Postgre - - php-versions: '8.1' - db-platforms: Postgre - mysql-versions: '8.0' - # SQLSRV - - php-versions: '8.1' - db-platforms: SQLSRV - mysql-versions: '8.0' - # OCI8 - - php-versions: '8.1' - db-platforms: OCI8 - mysql-versions: '8.0' services: mysql: - image: mysql:${{ matrix.mysql-versions }} + image: mysql:${{ inputs['mysql-version'] }} env: MYSQL_ALLOW_EMPTY_PASSWORD: yes MYSQL_DATABASE: test @@ -128,7 +126,7 @@ jobs: swap-storage: true - name: Create database for MSSQL Server - if: matrix.db-platforms == 'SQLSRV' + if: ${{ inputs['db-platform'] == 'SQLSRV' }} run: sqlcmd -S 127.0.0.1 -U sa -P 1Secure*Password1 -Q "CREATE DATABASE test" - name: Checkout @@ -137,7 +135,7 @@ jobs: - name: Set up PHP uses: shivammathur/setup-php@v2 with: - php-version: ${{ matrix.php-versions }} + php-version: ${{ inputs['php-version'] }} tools: composer, phive, phpunit extensions: intl, json, mbstring, gd, xdebug, xml, sqlite3, sqlsrv, oci8, pgsql coverage: xdebug @@ -162,16 +160,16 @@ jobs: composer update ${{ env.COMPOSER_UPDATE_FLAGS }} --no-progress --no-interaction --prefer-dist --optimize-autoloader fi env: - COMPOSER_UPDATE_FLAGS: ${{ matrix.dependencies == 'lowest' && '--prefer-lowest' || '' }} + COMPOSER_UPDATE_FLAGS: ${{ inputs['dependencies'] == 'lowest' && '--prefer-lowest' || '' }} - name: Test with PHPUnit run: vendor/bin/phpunit --coverage-text --testsuite main env: - DB: ${{ matrix.db-platforms }} + DB: ${{ inputs['db-platform'] }} TERM: xterm-256color TACHYCARDIA_MONITOR_GA: enabled - - if: matrix.php-versions == '8.1' + - if: ${{ inputs['php-version'] == inputs['coveralls-php'] }} name: Run Coveralls continue-on-error: true run: | @@ -180,7 +178,7 @@ jobs: env: COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }} COVERALLS_PARALLEL: true - COVERALLS_FLAG_NAME: PHP ${{ matrix.php-versions }} - ${{ matrix.db-platforms }} + COVERALLS_FLAG_NAME: PHP ${{ inputs['php-version'] }} - ${{ inputs['db-platform'] }} coveralls: needs: [main] diff --git a/.github/workflows/psalm.yml b/.github/workflows/psalm.yml index 5cae11c..732454d 100644 --- a/.github/workflows/psalm.yml +++ b/.github/workflows/psalm.yml @@ -18,6 +18,11 @@ on: - 'psalm*' - '.github/workflows/psalm.yml' workflow_call: + inputs: + php-version: + required: false + type: string + default: '8.1' concurrency: group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }} @@ -39,7 +44,7 @@ jobs: - name: Setup PHP uses: shivammathur/setup-php@v2 with: - php-version: '8.1' + php-version: ${{ inputs['php-version'] }} tools: phpstan, phpunit extensions: intl, json, mbstring, xml coverage: none diff --git a/.github/workflows/rector.yml b/.github/workflows/rector.yml index cefbc16..4525d15 100644 --- a/.github/workflows/rector.yml +++ b/.github/workflows/rector.yml @@ -18,6 +18,11 @@ on: - 'rector.php' - '.github/workflows/rector.yml' workflow_call: + inputs: + php-version: + required: false + type: string + default: '8.1' concurrency: group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }} @@ -28,13 +33,9 @@ permissions: jobs: build: - name: PHP ${{ matrix.php-versions }} Rector Analysis + name: PHP ${{ inputs['php-version'] }} Rector Analysis runs-on: ubuntu-latest if: (! contains(github.event.head_commit.message, '[ci skip]')) - strategy: - fail-fast: false - matrix: - php-versions: ['8.1', '8.4'] steps: - name: Checkout @@ -43,7 +44,7 @@ jobs: - name: Set up PHP uses: shivammathur/setup-php@v2 with: - php-version: ${{ matrix.php-versions }} + php-version: ${{ inputs['php-version'] }} tools: phpstan extensions: intl, json, mbstring, xml coverage: none diff --git a/.github/workflows/unused.yml b/.github/workflows/unused.yml index 94665d8..ede150d 100644 --- a/.github/workflows/unused.yml +++ b/.github/workflows/unused.yml @@ -16,6 +16,11 @@ on: - 'composer.*' - '.github/workflows/unused.yml' workflow_call: + inputs: + php-version: + required: false + type: string + default: '8.2' concurrency: group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }} @@ -37,7 +42,7 @@ jobs: - name: Setup PHP uses: shivammathur/setup-php@v2 with: - php-version: '8.2' + php-version: ${{ inputs['php-version'] }} tools: composer, composer-unused extensions: intl, json, mbstring, xml coverage: none diff --git a/README.md b/README.md index 0b79831..bdf0426 100644 --- a/README.md +++ b/README.md @@ -2,3 +2,35 @@ This repository contains the default templates for GitHub for the CodeIgniter organization. + +### Using Reusable Workflows + +Each reusable workflow defines `inputs` under the `workflow_call` trigger. +If you don't specify your own inputs, the workflow will use the defined default values. + +To customize inputs, you must define them under the `with` section in your workflow. + +**Basic Example:** + +```yaml +jobs: + psalm: + uses: codeigniter4/.github/.github/workflows/psalm.yml@CI46 + with: + php-version: '8.2' +``` + +**Advanced Example (Using Matrix Strategy)** + +```yaml +jobs: + rector: + strategy: + fail-fast: false + matrix: + php-version: ['8.2', '8.4'] + + uses: codeigniter4/.github/.github/workflows/rector.yml@CI46 + with: + php-version: ${{ matrix.php-version }} +``` \ No newline at end of file From 5dcc97ff715a2ba561cb71b8aa4448ed91e63993 Mon Sep 17 00:00:00 2001 From: michalsn Date: Thu, 7 Aug 2025 09:26:37 +0200 Subject: [PATCH 11/16] fix workflow_call structure --- .github/workflows/phpunit-lowest.yml | 41 ++++++++++++++-------------- 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/.github/workflows/phpunit-lowest.yml b/.github/workflows/phpunit-lowest.yml index ac8643c..b2b8341 100644 --- a/.github/workflows/phpunit-lowest.yml +++ b/.github/workflows/phpunit-lowest.yml @@ -19,26 +19,27 @@ on: - 'phpunit*' - '.github/workflows/phpunit-lowest.yml' workflow_call: - php-version: - required: false - type: string - default: '8.1' - db-platform: - required: false - type: string - default: 'MySQLi' - mysql-version: - required: false - type: string - default: '5.7' - dependencies: - required: false - type: string - default: 'lowest' - coveralls-php: - required: false - type: string - default: '8.1' + inputs: + php-version: + required: false + type: string + default: '8.1' + db-platform: + required: false + type: string + default: 'MySQLi' + mysql-version: + required: false + type: string + default: '5.7' + dependencies: + required: false + type: string + default: 'lowest' + coveralls-php: + required: false + type: string + default: '8.1' concurrency: group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }} From 6cfd7225c46c1bd452236c0a49624eaf55115489 Mon Sep 17 00:00:00 2001 From: michalsn Date: Thu, 14 Aug 2025 15:28:01 +0200 Subject: [PATCH 12/16] disable concurency --- .github/workflows/deptrac.yml | 2 +- .github/workflows/infection.yml | 2 +- .github/workflows/label-add-conflict-all-pr.yml | 2 +- .github/workflows/label-signing.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 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/deptrac.yml b/.github/workflows/deptrac.yml index 95ac408..2344523 100644 --- a/.github/workflows/deptrac.yml +++ b/.github/workflows/deptrac.yml @@ -26,7 +26,7 @@ on: concurrency: group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }} - cancel-in-progress: true + cancel-in-progress: false permissions: contents: read diff --git a/.github/workflows/infection.yml b/.github/workflows/infection.yml index 4f46b2a..c30268a 100644 --- a/.github/workflows/infection.yml +++ b/.github/workflows/infection.yml @@ -18,7 +18,7 @@ on: concurrency: group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }} - cancel-in-progress: true + cancel-in-progress: false permissions: contents: read diff --git a/.github/workflows/label-add-conflict-all-pr.yml b/.github/workflows/label-add-conflict-all-pr.yml index 781febd..90b7462 100644 --- a/.github/workflows/label-add-conflict-all-pr.yml +++ b/.github/workflows/label-add-conflict-all-pr.yml @@ -8,7 +8,7 @@ on: concurrency: group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }} - cancel-in-progress: true + cancel-in-progress: false permissions: contents: read diff --git a/.github/workflows/label-signing.yml b/.github/workflows/label-signing.yml index 685c8d9..a3cb615 100644 --- a/.github/workflows/label-signing.yml +++ b/.github/workflows/label-signing.yml @@ -7,7 +7,7 @@ on: concurrency: group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }} - cancel-in-progress: true + cancel-in-progress: false permissions: contents: read diff --git a/.github/workflows/phpcpd.yml b/.github/workflows/phpcpd.yml index 9988aaa..25f7b09 100644 --- a/.github/workflows/phpcpd.yml +++ b/.github/workflows/phpcpd.yml @@ -30,7 +30,7 @@ on: concurrency: group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }} - cancel-in-progress: true + cancel-in-progress: false permissions: contents: read diff --git a/.github/workflows/phpcsfixer.yml b/.github/workflows/phpcsfixer.yml index 898d76e..21db69b 100644 --- a/.github/workflows/phpcsfixer.yml +++ b/.github/workflows/phpcsfixer.yml @@ -22,7 +22,7 @@ on: concurrency: group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }} - cancel-in-progress: true + cancel-in-progress: false permissions: contents: read diff --git a/.github/workflows/phpstan.yml b/.github/workflows/phpstan.yml index 82966a4..f5c7edc 100644 --- a/.github/workflows/phpstan.yml +++ b/.github/workflows/phpstan.yml @@ -26,7 +26,7 @@ on: concurrency: group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }} - cancel-in-progress: true + cancel-in-progress: false permissions: contents: read diff --git a/.github/workflows/phpunit-lowest.yml b/.github/workflows/phpunit-lowest.yml index b2b8341..9af8657 100644 --- a/.github/workflows/phpunit-lowest.yml +++ b/.github/workflows/phpunit-lowest.yml @@ -43,7 +43,7 @@ on: concurrency: group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }} - cancel-in-progress: true + cancel-in-progress: false permissions: contents: read diff --git a/.github/workflows/phpunit-no-db.yml b/.github/workflows/phpunit-no-db.yml index 6d19a8f..760fc72 100644 --- a/.github/workflows/phpunit-no-db.yml +++ b/.github/workflows/phpunit-no-db.yml @@ -35,7 +35,7 @@ on: concurrency: group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }} - cancel-in-progress: true + cancel-in-progress: false permissions: contents: read diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml index 62ae636..f97876c 100644 --- a/.github/workflows/phpunit.yml +++ b/.github/workflows/phpunit.yml @@ -43,7 +43,7 @@ on: concurrency: group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }} - cancel-in-progress: true + cancel-in-progress: false permissions: contents: read diff --git a/.github/workflows/psalm.yml b/.github/workflows/psalm.yml index 732454d..0ea2c5e 100644 --- a/.github/workflows/psalm.yml +++ b/.github/workflows/psalm.yml @@ -26,7 +26,7 @@ on: concurrency: group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }} - cancel-in-progress: true + cancel-in-progress: false permissions: contents: read diff --git a/.github/workflows/rector.yml b/.github/workflows/rector.yml index 4525d15..cfdfef4 100644 --- a/.github/workflows/rector.yml +++ b/.github/workflows/rector.yml @@ -26,7 +26,7 @@ on: concurrency: group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }} - cancel-in-progress: true + cancel-in-progress: false permissions: contents: read diff --git a/.github/workflows/unused.yml b/.github/workflows/unused.yml index ede150d..703d553 100644 --- a/.github/workflows/unused.yml +++ b/.github/workflows/unused.yml @@ -24,7 +24,7 @@ on: concurrency: group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }} - cancel-in-progress: true + cancel-in-progress: false permissions: contents: read From bd5c73e357a210b9f71151ebc841423af38280e8 Mon Sep 17 00:00:00 2001 From: michalsn Date: Thu, 14 Aug 2025 15:45:15 +0200 Subject: [PATCH 13/16] remove concurency --- .github/workflows/phpunit.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml index f97876c..90b9472 100644 --- a/.github/workflows/phpunit.yml +++ b/.github/workflows/phpunit.yml @@ -41,10 +41,6 @@ on: type: string default: '8.1' -concurrency: - group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }} - cancel-in-progress: false - permissions: contents: read From 04ec7166e39d2c61336fcee27101097010896d33 Mon Sep 17 00:00:00 2001 From: michalsn Date: Thu, 14 Aug 2025 15:50:11 +0200 Subject: [PATCH 14/16] remove concurency --- .github/workflows/deptrac.yml | 4 ---- .github/workflows/infection.yml | 4 ---- .github/workflows/label-add-conflict-all-pr.yml | 4 ---- .github/workflows/label-signing.yml | 4 ---- .github/workflows/phpcpd.yml | 4 ---- .github/workflows/phpcsfixer.yml | 4 ---- .github/workflows/phpstan.yml | 4 ---- .github/workflows/phpunit-lowest.yml | 4 ---- .github/workflows/phpunit-no-db.yml | 4 ---- .github/workflows/psalm.yml | 4 ---- .github/workflows/rector.yml | 4 ---- .github/workflows/unused.yml | 4 ---- 12 files changed, 48 deletions(-) diff --git a/.github/workflows/deptrac.yml b/.github/workflows/deptrac.yml index 2344523..1e2d3f8 100644 --- a/.github/workflows/deptrac.yml +++ b/.github/workflows/deptrac.yml @@ -24,10 +24,6 @@ on: type: string default: '8.1' -concurrency: - group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }} - cancel-in-progress: false - permissions: contents: read diff --git a/.github/workflows/infection.yml b/.github/workflows/infection.yml index c30268a..e261423 100644 --- a/.github/workflows/infection.yml +++ b/.github/workflows/infection.yml @@ -16,10 +16,6 @@ on: type: string default: '8.2' -concurrency: - group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }} - cancel-in-progress: false - permissions: contents: read diff --git a/.github/workflows/label-add-conflict-all-pr.yml b/.github/workflows/label-add-conflict-all-pr.yml index 90b7462..4024ce9 100644 --- a/.github/workflows/label-add-conflict-all-pr.yml +++ b/.github/workflows/label-add-conflict-all-pr.yml @@ -6,10 +6,6 @@ on: - develop workflow_call: -concurrency: - group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }} - cancel-in-progress: false - permissions: contents: read pull-requests: write diff --git a/.github/workflows/label-signing.yml b/.github/workflows/label-signing.yml index a3cb615..251a410 100644 --- a/.github/workflows/label-signing.yml +++ b/.github/workflows/label-signing.yml @@ -5,10 +5,6 @@ on: - 'develop' workflow_call: -concurrency: - group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }} - cancel-in-progress: false - permissions: contents: read pull-requests: write diff --git a/.github/workflows/phpcpd.yml b/.github/workflows/phpcpd.yml index 25f7b09..2417d87 100644 --- a/.github/workflows/phpcpd.yml +++ b/.github/workflows/phpcpd.yml @@ -28,10 +28,6 @@ on: type: string default: '8.1' -concurrency: - group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }} - cancel-in-progress: false - permissions: contents: read diff --git a/.github/workflows/phpcsfixer.yml b/.github/workflows/phpcsfixer.yml index 21db69b..5b634fa 100644 --- a/.github/workflows/phpcsfixer.yml +++ b/.github/workflows/phpcsfixer.yml @@ -20,10 +20,6 @@ on: type: string default: '8.1' -concurrency: - group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }} - cancel-in-progress: false - permissions: contents: read diff --git a/.github/workflows/phpstan.yml b/.github/workflows/phpstan.yml index f5c7edc..80b072e 100644 --- a/.github/workflows/phpstan.yml +++ b/.github/workflows/phpstan.yml @@ -24,10 +24,6 @@ on: type: string default: '8.1' -concurrency: - group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }} - cancel-in-progress: false - permissions: contents: read diff --git a/.github/workflows/phpunit-lowest.yml b/.github/workflows/phpunit-lowest.yml index 9af8657..6f236c5 100644 --- a/.github/workflows/phpunit-lowest.yml +++ b/.github/workflows/phpunit-lowest.yml @@ -41,10 +41,6 @@ on: type: string default: '8.1' -concurrency: - group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }} - cancel-in-progress: false - permissions: contents: read diff --git a/.github/workflows/phpunit-no-db.yml b/.github/workflows/phpunit-no-db.yml index 760fc72..1564de6 100644 --- a/.github/workflows/phpunit-no-db.yml +++ b/.github/workflows/phpunit-no-db.yml @@ -33,10 +33,6 @@ on: type: string default: '8.1' -concurrency: - group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }} - cancel-in-progress: false - permissions: contents: read diff --git a/.github/workflows/psalm.yml b/.github/workflows/psalm.yml index 0ea2c5e..e577a15 100644 --- a/.github/workflows/psalm.yml +++ b/.github/workflows/psalm.yml @@ -24,10 +24,6 @@ on: type: string default: '8.1' -concurrency: - group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }} - cancel-in-progress: false - permissions: contents: read diff --git a/.github/workflows/rector.yml b/.github/workflows/rector.yml index cfdfef4..b8eb789 100644 --- a/.github/workflows/rector.yml +++ b/.github/workflows/rector.yml @@ -24,10 +24,6 @@ on: type: string default: '8.1' -concurrency: - group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }} - cancel-in-progress: false - permissions: contents: read diff --git a/.github/workflows/unused.yml b/.github/workflows/unused.yml index 703d553..8434642 100644 --- a/.github/workflows/unused.yml +++ b/.github/workflows/unused.yml @@ -22,10 +22,6 @@ on: type: string default: '8.2' -concurrency: - group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }} - cancel-in-progress: false - permissions: contents: read From 1b8847a1851794e2376080d6951b533277397cc1 Mon Sep 17 00:00:00 2001 From: michalsn Date: Sat, 7 Feb 2026 12:41:01 +0100 Subject: [PATCH 15/16] Add a branch for CI 4.7 --- .github/workflows/deptrac.yml | 2 +- .github/workflows/phpcpd.yml | 2 +- .github/workflows/phpcsfixer.yml | 2 +- .github/workflows/phpstan.yml | 2 +- .github/workflows/phpunit-lowest.yml | 4 ++-- .github/workflows/phpunit-no-db.yml | 4 ++-- .github/workflows/phpunit.yml | 4 ++-- .github/workflows/psalm.yml | 2 +- .github/workflows/rector.yml | 2 +- README.md | 4 ++-- 10 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.github/workflows/deptrac.yml b/.github/workflows/deptrac.yml index 1e2d3f8..513fa1f 100644 --- a/.github/workflows/deptrac.yml +++ b/.github/workflows/deptrac.yml @@ -22,7 +22,7 @@ on: php-version: required: false type: string - default: '8.1' + default: '8.2' permissions: contents: read diff --git a/.github/workflows/phpcpd.yml b/.github/workflows/phpcpd.yml index 2417d87..9645ac8 100644 --- a/.github/workflows/phpcpd.yml +++ b/.github/workflows/phpcpd.yml @@ -26,7 +26,7 @@ on: php-version: required: false type: string - default: '8.1' + default: '8.2' permissions: contents: read diff --git a/.github/workflows/phpcsfixer.yml b/.github/workflows/phpcsfixer.yml index 5b634fa..dbc6de5 100644 --- a/.github/workflows/phpcsfixer.yml +++ b/.github/workflows/phpcsfixer.yml @@ -18,7 +18,7 @@ on: php-version: required: false type: string - default: '8.1' + default: '8.2' permissions: contents: read diff --git a/.github/workflows/phpstan.yml b/.github/workflows/phpstan.yml index 80b072e..dd9c07b 100644 --- a/.github/workflows/phpstan.yml +++ b/.github/workflows/phpstan.yml @@ -22,7 +22,7 @@ on: php-version: required: false type: string - default: '8.1' + default: '8.2' permissions: contents: read diff --git a/.github/workflows/phpunit-lowest.yml b/.github/workflows/phpunit-lowest.yml index 6f236c5..f1ceae6 100644 --- a/.github/workflows/phpunit-lowest.yml +++ b/.github/workflows/phpunit-lowest.yml @@ -23,7 +23,7 @@ on: php-version: required: false type: string - default: '8.1' + default: '8.2' db-platform: required: false type: string @@ -39,7 +39,7 @@ on: coveralls-php: required: false type: string - default: '8.1' + default: '8.2' permissions: contents: read diff --git a/.github/workflows/phpunit-no-db.yml b/.github/workflows/phpunit-no-db.yml index 1564de6..53eb579 100644 --- a/.github/workflows/phpunit-no-db.yml +++ b/.github/workflows/phpunit-no-db.yml @@ -23,7 +23,7 @@ on: php-version: required: false type: string - default: '8.1' + default: '8.2' dependencies: required: false type: string @@ -31,7 +31,7 @@ on: coveralls-php: required: false type: string - default: '8.1' + default: '8.2' permissions: contents: read diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml index 90b9472..797bffa 100644 --- a/.github/workflows/phpunit.yml +++ b/.github/workflows/phpunit.yml @@ -23,7 +23,7 @@ on: php-version: required: false type: string - default: '8.1' + default: '8.2' db-platform: required: false type: string @@ -39,7 +39,7 @@ on: coveralls-php: required: false type: string - default: '8.1' + default: '8.2' permissions: contents: read diff --git a/.github/workflows/psalm.yml b/.github/workflows/psalm.yml index e577a15..f43313c 100644 --- a/.github/workflows/psalm.yml +++ b/.github/workflows/psalm.yml @@ -22,7 +22,7 @@ on: php-version: required: false type: string - default: '8.1' + default: '8.2' permissions: contents: read diff --git a/.github/workflows/rector.yml b/.github/workflows/rector.yml index b8eb789..537622b 100644 --- a/.github/workflows/rector.yml +++ b/.github/workflows/rector.yml @@ -22,7 +22,7 @@ on: php-version: required: false type: string - default: '8.1' + default: '8.2' permissions: contents: read diff --git a/README.md b/README.md index bdf0426..5e996c6 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@ To customize inputs, you must define them under the `with` section in your workf ```yaml jobs: psalm: - uses: codeigniter4/.github/.github/workflows/psalm.yml@CI46 + uses: codeigniter4/.github/.github/workflows/psalm.yml@CI47 with: php-version: '8.2' ``` @@ -30,7 +30,7 @@ jobs: matrix: php-version: ['8.2', '8.4'] - uses: codeigniter4/.github/.github/workflows/rector.yml@CI46 + uses: codeigniter4/.github/.github/workflows/rector.yml@CI47 with: php-version: ${{ matrix.php-version }} ``` \ No newline at end of file From e91afedfe5d79d5dc4c1deb25893baa314040911 Mon Sep 17 00:00:00 2001 From: michalsn Date: Mon, 20 Jul 2026 18:38:46 +0200 Subject: [PATCH 16/16] update mssql version to 2025 --- .github/workflows/phpunit.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml index 797bffa..f06ca10 100644 --- a/.github/workflows/phpunit.yml +++ b/.github/workflows/phpunit.yml @@ -77,7 +77,7 @@ jobs: options: --health-cmd=pg_isready --health-interval=10s --health-timeout=5s --health-retries=3 mssql: - image: mcr.microsoft.com/mssql/server:2022-latest + image: mcr.microsoft.com/mssql/server:2025-latest env: MSSQL_SA_PASSWORD: 1Secure*Password1 ACCEPT_EULA: Y