From 288512e424dc6bc9d2cb100a8c46e250252ff1a3 Mon Sep 17 00:00:00 2001 From: Dmitry Tsemma Date: Wed, 25 Jun 2025 11:19:26 +0300 Subject: [PATCH 1/5] FRW-10317 Upgrade Ubuntu version in CI --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f43043c..f06e1a7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -10,7 +10,7 @@ on: jobs: validation: name: Validation - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v2 @@ -36,7 +36,7 @@ jobs: lowest: name: Prefer Lowest - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v2 From c85d86da2be00da316d1b54354e59315688a3246 Mon Sep 17 00:00:00 2001 From: Dmitry Tsemma Date: Wed, 25 Jun 2025 16:32:04 +0300 Subject: [PATCH 2/5] Update ci.yml --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f06e1a7..962b60c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -10,7 +10,7 @@ on: jobs: validation: name: Validation - runs-on: ubuntu-22.04 + runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 @@ -36,7 +36,7 @@ jobs: lowest: name: Prefer Lowest - runs-on: ubuntu-22.04 + runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 From 1d55d3159a98326f4904cb5e330060f5231ff401 Mon Sep 17 00:00:00 2001 From: Dmitry Tsemma Date: Thu, 26 Jun 2025 11:14:37 +0300 Subject: [PATCH 3/5] Update ci.yml --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 962b60c..d26bf32 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,10 +1,10 @@ name: CI on: + pull_request: push: branches: - - 'master' - pull_request: + - master workflow_dispatch: jobs: From bf71839eb13b50d2d79a71ab5ade7b029a302c89 Mon Sep 17 00:00:00 2001 From: Dmitry Tsemma Date: Thu, 26 Jun 2025 11:33:23 +0300 Subject: [PATCH 4/5] Update ci.yml --- .github/workflows/ci.yml | 87 +++++++++++++++++++++++++++++++--------- 1 file changed, 67 insertions(+), 20 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d26bf32..2ae9b1c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -9,24 +9,54 @@ on: jobs: validation: - name: Validation runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + php-version: [ + '8.2', + '8.3' + ] steps: - - uses: actions/checkout@v2 - - name: Setup PHP uses: shivammathur/setup-php@v2 with: - php-version: [ - '8.2', - '8.3' - ] - extensions: mbstring, intl, bcmath - coverage: none + php-version: ${{ matrix.php-version }} + extensions: mbstring, intl, pdo_mysql + + - name: Checkout + uses: actions/checkout@v2 + + - name: Composer validate + run: composer validate + + - name: Composer get cache directory + id: composer-cache + run: | + echo "::set-output name=dir::$(composer config cache-files-dir)" + + - name: Composer cache + uses: actions/cache@v3 + with: + path: ${{ steps.composer-cache.outputs.dir }} + key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }} + restore-keys: | + ${{ runner.os }}-composer- + + - name: Composer install + run: | + composer --version + composer install --optimize-autoloader - - name: Composer Install - run: composer install --prefer-dist --no-interaction --profile + - name: Codeception tests + run: | + vendor/bin/codecept build + XDEBUG_MODE=coverage vendor/bin/codecept run --coverage-xml + + - name: Code Coverage Report + if: success() + uses: codecov/codecov-action@v1 - name: PHPStan checks run: composer stan @@ -34,22 +64,39 @@ jobs: - name: CodeStyle checks run: composer cs-check - lowest: - name: Prefer Lowest + prefer-lowest: runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + php-version: [ + '8.2' + ] steps: - - uses: actions/checkout@v2 + - name: Checkout + uses: actions/checkout@v2 - name: Setup PHP uses: shivammathur/setup-php@v2 with: - php-version: '8.2' - extensions: mbstring, intl, bcmath - coverage: none + php-version: ${{ matrix.php-version }} + extensions: mbstring, intl, pdo_mysql + + - name: Get Composer Cache Directory + id: composer-cache + run: | + echo "::set-output name=dir::$(composer config cache-files-dir)" + + - name: Composer cache + uses: actions/cache@v3 + with: + path: ${{ steps.composer-cache.outputs.dir }} + key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }} + restore-keys: ${{ runner.os }}-composer- - name: Composer prefer-lowest - run: composer update --prefer-dist --no-interaction --prefer-lowest --prefer-stable + run: composer update --prefer-dist --no-interaction --prefer-lowest --prefer-stable -o - - name: PHPStan checks - run: composer stan + - name: Codecept run test + run: composer test From 5406d23b489a1c409da47e10af223b5dbdd5862f Mon Sep 17 00:00:00 2001 From: Dmitry Tsemma Date: Thu, 26 Jun 2025 11:35:32 +0300 Subject: [PATCH 5/5] Update ci.yml --- .github/workflows/ci.yml | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2ae9b1c..cfc628c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -49,14 +49,6 @@ jobs: composer --version composer install --optimize-autoloader - - name: Codeception tests - run: | - vendor/bin/codecept build - XDEBUG_MODE=coverage vendor/bin/codecept run --coverage-xml - - - name: Code Coverage Report - if: success() - uses: codecov/codecov-action@v1 - name: PHPStan checks run: composer stan @@ -98,5 +90,5 @@ jobs: - name: Composer prefer-lowest run: composer update --prefer-dist --no-interaction --prefer-lowest --prefer-stable -o - - name: Codecept run test - run: composer test + - name: PHPStan checks + run: composer stan