From 477d94f32c7002a1f949eded09b1c4e9c42eefe4 Mon Sep 17 00:00:00 2001 From: Robin Chalas Date: Mon, 4 Dec 2023 02:06:17 +0100 Subject: [PATCH] [GHA] Infra & build updates --- .github/workflows/ci.yml | 35 +++++++------------------- .github/workflows/coding-standards.yml | 4 +-- .github/workflows/web-token-ci.yml | 23 +++++++++-------- 3 files changed, 23 insertions(+), 39 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index fe9667fb..7029a542 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,42 +18,29 @@ jobs: composer-flags: '--prefer-stable --prefer-lowest' can-fail: false # LTS with latest stable PHP - - php: 8.2 - symfony: 5.4.* + - php: 8.3 + symfony: 6.4.* composer-flags: '--prefer-stable' can-fail: false # Stable Symfony branches - php: 8.2 - symfony: 6.0.* + symfony: 6.3.* composer-flags: '--prefer-stable' can-fail: false - php: 8.2 - symfony: 6.1.* + symfony: 6.4.* composer-flags: '--prefer-stable' can-fail: false - - php: 8.2 - symfony: 6.2.* + - php: 8.3 + symfony: 7.0.* composer-flags: '--prefer-stable' can-fail: false - - php: 8.2 - symfony: 6.3.* - composer-flags: '--prefer-stable' - can-fail: false - # Development Symfony branches - - php: 8.2 - symfony: 6.4.*@dev - composer-flags: '' - can-fail: false - - php: 8.2 - symfony: 7.0.*@dev - composer-flags: '' - can-fail: false name: "PHP ${{ matrix.php }} - Symfony ${{ matrix.symfony }}${{ matrix.composer-flags != '' && format(' - Composer {0}', matrix.composer-flags) || '' }}" steps: - name: "Checkout" - uses: "actions/checkout@v3" + uses: "actions/checkout@v4" with: fetch-depth: 2 @@ -70,16 +57,12 @@ jobs: php-version: "${{ matrix.php }}" tools: "composer:v2,flex" - - name: "Set Composer stability" - if: "matrix.symfony == '6.4.*@dev' || matrix.symfony == '7.0.*@dev'" - run: "composer config minimum-stability dev" - - name: "Remove symfony/security-guard" - if: "matrix.symfony == '6.0.*' || matrix.symfony == '6.1.*' || matrix.symfony == '6.2.*' || matrix.symfony == '6.3.*' || matrix.symfony == '6.4.*@dev' || matrix.symfony == '7.0.*@dev'" + if: "matrix.symfony == '6.3.*' || matrix.symfony == '6.4.*' || matrix.symfony == '7.0.*'" run: "composer remove --dev --no-update symfony/security-guard" - name: "Install api-platform/core" - if: "matrix.symfony == '6.1.*' || matrix.symfony == '6.2.*' || matrix.symfony == '6.3.*' || matrix.symfony == '6.4.*@dev'" + if: "matrix.symfony == '6.3.*' || matrix.symfony == '6.4.*' || matrix.symfony == '7.0.*'" run: "composer require --dev --no-update api-platform/core:^3.0" - name: "Install dependencies" diff --git a/.github/workflows/coding-standards.yml b/.github/workflows/coding-standards.yml index ad8eba60..9e14472e 100644 --- a/.github/workflows/coding-standards.yml +++ b/.github/workflows/coding-standards.yml @@ -8,12 +8,12 @@ jobs: strategy: matrix: operating-system: [ubuntu-latest] - php-versions: ['8.1'] + php-versions: ['8.3'] name: PHP ${{ matrix.php-versions }} Test on ${{ matrix.operating-system }} steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: ref: ${{ github.head_ref }} diff --git a/.github/workflows/web-token-ci.yml b/.github/workflows/web-token-ci.yml index 4083d0cf..ea2a90cd 100644 --- a/.github/workflows/web-token-ci.yml +++ b/.github/workflows/web-token-ci.yml @@ -12,15 +12,20 @@ jobs: fail-fast: false matrix: include: - # LTS with latest stable PHP + # Lowest deps - php: 8.1 symfony: 5.4.* - composer-flags: '--prefer-stable' can-fail: false - # Development Symfony branches + # LTS with latest stable PHP + - php: 8.3 + symfony: 6.4.* + can-fail: false + # Stable Symfony branches - php: 8.1 - symfony: 6.2.*@dev - composer-flags: '' + symfony: 6.3.* + can-fail: false + - php: 8.2 + symfony: 6.4.* can-fail: false name: "PHP ${{ matrix.php }} - Symfony ${{ matrix.symfony }}${{ matrix.composer-flags != '' && format(' - Composer {0}', matrix.composer-flags) || '' }}" @@ -44,12 +49,8 @@ jobs: php-version: "${{ matrix.php }}" tools: "composer:v2,flex" - - name: "Set Composer stability" - if: "matrix.symfony == '6.2.*@dev'" - run: "composer config minimum-stability dev" - - name: "Remove symfony/security-guard" - if: "matrix.symfony == '6.0.*' || matrix.symfony == '6.1.*' || matrix.symfony == '6.2.*@dev'" + if: "matrix.symfony == '6.3.*' || matrix.symfony == '6.4.*' || matrix.symfony == '7.0.*'" run: "composer remove --dev --no-update symfony/security-guard" @@ -63,7 +64,7 @@ jobs: composer require --dev --no-update web-token/jwt-encryption-algorithm-aesgcmkw:"^3.0.6" - name: "Install dependencies" - run: "composer update ${{ matrix.composer-flags }} --prefer-dist" + run: "composer update ${{ matrix.composer-flags }} --prefer-dist --prefer-stable" env: SYMFONY_REQUIRE: "${{ matrix.symfony }}"