Merge branch 'master' into php-73.

yiisoft · Mar 22, 2024 · 60f1df5 · 60f1df5
2 parents 3357e64 + 28cbf6c
commit 60f1df5
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 35 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -39,6 +39,11 @@ jobs:
           - php: 8.3
             extensions: apcu, curl, dom, imagick, intl, mbstring, mcrypt, memcached
             coverage: none
+            os: ubuntu-latest
+          - php: 8.4
+            extensions: apcu, curl, dom, imagick, intl, mbstring, mcrypt, memcached
+            coverage: none
+            os: ubuntu-latest
 
     steps:
       - name: Generate french locale.

diff --git a/.github/workflows/ci-mssql.yml b/.github/workflows/ci-mssql.yml
@@ -31,6 +31,8 @@ jobs:
             mssql: server:2022-latest
           - php: 8.3
             mssql: server:2022-latest
+          - php: 8.4
+            mssql: server:2022-latest
 
     services:
       mssql:

diff --git a/.github/workflows/ci-mysql.yml b/.github/workflows/ci-mysql.yml
@@ -19,16 +19,9 @@ jobs:
 
     strategy:
       matrix:
-        php:
-          - 7.4
-          - 8.0
-          - 8.1
-          - 8.2
-          - 8.3
-
-        mysql:
-          - 5.7
-          - latest
+        os: [ubuntu-latest]
+        php: [7.4, 8.0, 8.1, 8.2, 8.3, 8.4]
+        mysql: [5.7, latest]
 
     services:
       mysql:

diff --git a/.github/workflows/ci-oracle.yml b/.github/workflows/ci-oracle.yml
@@ -20,11 +20,8 @@ jobs:
 
     strategy:
       matrix:
-        os:
-          - ubuntu-latest
-
-        php:
-          - 7.4
+        os: [ubuntu-latest]
+        php: [7.4]
 
     services:
       oci:

diff --git a/.github/workflows/ci-pgsql.yml b/.github/workflows/ci-pgsql.yml
@@ -19,20 +19,9 @@ jobs:
 
     strategy:
       matrix:
-        php:
-          - 7.4
-          - 8.0
-          - 8.1
-          - 8.2
-          - 8.3
-
-        pgsql:
-          - 10
-          - 11
-          - 12
-          - 13
-          - 14
-          - 15
+        os: [ubuntu-latest]
+        php: [7.4, 8.0, 8.1, 8.2, 8.3, 8.4]
+        pgsql: [10, 11, 12, 13, 14, 15]
 
     services:
       postgres:

diff --git a/.github/workflows/ci-sqlite.yml b/.github/workflows/ci-sqlite.yml
@@ -20,12 +20,8 @@ jobs:
 
     strategy:
         matrix:
-            php:
-              - 7.4
-              - 8.0
-              - 8.1
-              - 8.2
-              - 8.3
+            os: [ubuntu-latest]
+            php: [7.4, 8.0, 8.1, 8.2, 8.3, 8.4]
 
     steps:
       - name: Checkout.