From e2d0aaa08940c2f71a182beb8e634f72c3e4ae77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Tamarelle?= Date: Thu, 10 Apr 2025 14:35:00 +0200 Subject: [PATCH 1/4] PHPLIB-1662 Update GHA test jobs to ubuntu-22.04 --- .github/workflows/tests.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index b43d76c60..5b7506e17 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -23,7 +23,7 @@ jobs: fail-fast: true matrix: os: - - "ubuntu-20.04" + - "ubuntu-22.04" php-version: - "8.1" - "8.2" @@ -34,23 +34,23 @@ jobs: topology: - "server" include: - - os: "ubuntu-20.04" + - os: "ubuntu-22.04" php-version: "8.1" mongodb-version: "6.0" topology: "replica_set" - - os: "ubuntu-20.04" + - os: "ubuntu-22.04" php-version: "8.1" mongodb-version: "6.0" topology: "sharded_cluster" - - os: "ubuntu-20.04" + - os: "ubuntu-22.04" php-version: "8.1" mongodb-version: "5.0" topology: "server" - - os: "ubuntu-20.04" + - os: "ubuntu-22.04" php-version: "8.1" mongodb-version: "4.4" topology: "replica_set" - - os: "ubuntu-20.04" + - os: "ubuntu-22.04" php-version: "8.1" mongodb-version: "4.4" topology: "sharded_cluster" From c6475d94a38f263ac2f283aa23c27ad9cc4e7fe7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Tamarelle?= Date: Thu, 10 Apr 2025 15:09:00 +0200 Subject: [PATCH 2/4] Run only MongoDB versions supported by ubuntu-22.04 --- .github/workflows/tests.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 5b7506e17..827146614 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -30,7 +30,7 @@ jobs: - "8.3" - "8.4" mongodb-version: - - "4.4" + - "6.0" topology: - "server" include: @@ -44,15 +44,15 @@ jobs: topology: "sharded_cluster" - os: "ubuntu-22.04" php-version: "8.1" - mongodb-version: "5.0" + mongodb-version: "8.0" topology: "server" - - os: "ubuntu-22.04" + - os: "ubuntu-24.04" php-version: "8.1" - mongodb-version: "4.4" + mongodb-version: "8.0" topology: "replica_set" - - os: "ubuntu-22.04" + - os: "ubuntu-24.04" php-version: "8.1" - mongodb-version: "4.4" + mongodb-version: "8.0" topology: "sharded_cluster" steps: From ffa9ab106e3e084cad2c8938a69caf6bf90bb3b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Tamarelle?= Date: Thu, 10 Apr 2025 15:24:31 +0200 Subject: [PATCH 3/4] Use a PHP extension cache unique per driver version --- .github/actions/setup/action.yml | 2 +- .github/workflows/tests.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/actions/setup/action.yml b/.github/actions/setup/action.yml index 48d916394..c66c0fa8f 100644 --- a/.github/actions/setup/action.yml +++ b/.github/actions/setup/action.yml @@ -24,7 +24,7 @@ runs: with: php-version: ${{ inputs.php-version }} extensions: "mongodb-${{ inputs.driver-version }}" - key: "extcache-v1" + key: "extcache-${{ inputs.driver-version }}" - name: Cache extensions uses: actions/cache@v4 diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 827146614..58bcd0c85 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -42,7 +42,7 @@ jobs: php-version: "8.1" mongodb-version: "6.0" topology: "sharded_cluster" - - os: "ubuntu-22.04" + - os: "ubuntu-24.04" php-version: "8.1" mongodb-version: "8.0" topology: "server" From db677d8d748aa3e63c4264d3c34dac3620b64dac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Tamarelle?= Date: Fri, 11 Apr 2025 13:05:35 +0200 Subject: [PATCH 4/4] Update ubuntu versions for other jobs --- .github/workflows/coding-standards.yml | 4 ++-- .github/workflows/generator.yml | 2 +- .github/workflows/static-analysis.yml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/coding-standards.yml b/.github/workflows/coding-standards.yml index 5552b1b6b..27bf72a6c 100644 --- a/.github/workflows/coding-standards.yml +++ b/.github/workflows/coding-standards.yml @@ -18,7 +18,7 @@ env: jobs: phpcs: name: "phpcs" - runs-on: "ubuntu-22.04" + runs-on: "ubuntu-24.04" steps: - name: "Checkout" @@ -36,7 +36,7 @@ jobs: rector: name: "Rector" - runs-on: "ubuntu-22.04" + runs-on: "ubuntu-24.04" steps: - name: "Checkout" diff --git a/.github/workflows/generator.yml b/.github/workflows/generator.yml index 786298fe3..ba60d56e3 100644 --- a/.github/workflows/generator.yml +++ b/.github/workflows/generator.yml @@ -18,7 +18,7 @@ env: jobs: diff: name: "Diff check" - runs-on: "ubuntu-22.04" + runs-on: "ubuntu-24.04" steps: - name: "Checkout" diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml index 849ed7e7b..e84d33d5b 100644 --- a/.github/workflows/static-analysis.yml +++ b/.github/workflows/static-analysis.yml @@ -24,7 +24,7 @@ env: jobs: psalm: name: "Psalm" - runs-on: "ubuntu-22.04" + runs-on: "ubuntu-24.04" steps: - name: "Checkout"