Update workflows (#859)

yiisoft · Jul 28, 2024 · 439ed62 · 439ed62
1 parent e3de808
commit 439ed62
Show file tree

Hide file tree

Showing 11 changed files with 102 additions and 55 deletions.
diff --git a/.github/workflows/active-record.yml b/.github/workflows/active-record.yml
@@ -36,7 +36,7 @@ jobs:
 
     services:
       mysql:
-        image: mysql:8
+        image: mysql:latest
         env:
           MYSQL_ALLOW_EMPTY_PASSWORD: true
           MYSQL_PASSWORD: ''
@@ -58,7 +58,7 @@ jobs:
           --health-timeout 5s
           --health-retries 10
       postgres:
-        image: postgres:14
+        image: postgres:16
         env:
           POSTGRES_USER: root
           POSTGRES_PASSWORD: root
@@ -67,21 +67,21 @@ jobs:
           - 5432:5432
         options: --name=postgres --health-cmd="pg_isready" --health-interval=10s --health-timeout=5s --health-retries=3
       mssql:
-          image: mcr.microsoft.com/mssql/server:2019-latest
+          image: mcr.microsoft.com/mssql/server:2022-latest
           env:
               SA_PASSWORD: YourStrong!Passw0rd
               ACCEPT_EULA: Y
               MSSQL_PID: Developer
           ports:
               - 1433:1433
-          options: --name=mssql --health-cmd="/opt/mssql-tools/bin/sqlcmd -S localhost -U SA -P 'YourStrong!Passw0rd' -Q 'SELECT 1'" --health-interval=10s --health-timeout=5s --health-retries=3
+          options: --name=mssql --health-cmd="/opt/mssql-tools18/bin/sqlcmd -C -S localhost -U SA -P 'YourStrong!Passw0rd' -Q 'SELECT 1'" --health-interval=10s --health-timeout=5s --health-retries=3
 
     steps:
       - name: Checkout.
         uses: actions/checkout@v3
 
       - name: Create MS SQL Database.
-        run: docker exec -i mssql /opt/mssql-tools/bin/sqlcmd -S localhost -U SA -P 'YourStrong!Passw0rd' -Q 'CREATE DATABASE yiitest'
+        run: docker exec -i mssql /opt/mssql-tools18/bin/sqlcmd -C -S localhost -U SA -P 'YourStrong!Passw0rd' -Q 'CREATE DATABASE yiitest'
 
       - name: Install PHP with extensions.
         uses: shivammathur/setup-php@v2
@@ -165,7 +165,7 @@ jobs:
         run: vendor/bin/phpunit --testsuite ActiveRecord --coverage-clover=coverage.xml --colors=always
 
       - name: Upload coverage to Codecov.
-        if: matrix.php == '8.1'
+        if: matrix.php == '8.3'
         uses: codecov/codecov-action@v3
         with:
           token: ${{ secrets.CODECOV_TOKEN }}

diff --git a/.github/workflows/bc.yml_ b/.github/workflows/bc.yml_
@@ -20,4 +20,4 @@ jobs:
       os: >-
         ['ubuntu-latest']
       php: >-
-        ['8.1']
+        ['8.3']
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -2,15 +2,19 @@ on:
   pull_request:
     paths:
       - 'src/**'
+      - 'tests/**'
       - '.github/workflows/build.yml'
       - 'composer.json'
+      - 'phpunit.xml.dist'
 
   push:
     branches: ['master']
     paths:
       - 'src/**'
+      - 'tests/**'
       - '.github/workflows/build.yml'
       - 'composer.json'
+      - 'phpunit.xml.dist'
 
 name: build
 
@@ -33,6 +37,7 @@ jobs:
           - 8.0
           - 8.1
           - 8.2
+          - 8.3
 
     steps:
       - name: Checkout.
@@ -57,7 +62,7 @@ jobs:
         run: vendor/bin/phpunit --testsuite Db --coverage-clover=coverage.xml --colors=always
 
       - name: Upload coverage to Codecov.
-        if: matrix.os == 'ubuntu-latest' && matrix.php == '8.1'
+        if: matrix.os == 'ubuntu-latest' && matrix.php == '8.3'
         uses: codecov/codecov-action@v3
         with:
           token: ${{ secrets.CODECOV_TOKEN }}

diff --git a/.github/workflows/composer-require-checker.yml b/.github/workflows/composer-require-checker.yml
@@ -25,4 +25,4 @@ jobs:
       os: >-
         ['ubuntu-latest']
       php: >-
-        ['8.0', '8.1']
+        ['8.0', '8.1', '8.2', '8.3']
diff --git a/.github/workflows/db-mariadb.yml b/.github/workflows/db-mariadb.yml
@@ -2,15 +2,19 @@ on:
   pull_request:
     paths:
       - 'src/**'
+      - 'tests/**'
       - '.github/workflows/db-mariadb.yml'
       - 'composer.json'
+      - 'phpunit.xml.dist'
 
   push:
     branches: ['master']
     paths:
       - 'src/**'
+      - 'tests/**'
       - '.github/workflows/db-mariadb.yml'
       - 'composer.json'
+      - 'phpunit.xml.dist'
 
 name: db-mariadb
 
@@ -23,17 +27,12 @@ jobs:
       CURRENT_PACKAGE: db-mysql
       EXTENSIONS: pdo, pdo_mysql
 
-    runs-on: ${{ matrix.os }}
+    runs-on: ubuntu-latest
 
     strategy:
       matrix:
-        os:
-          - ubuntu-latest
-
         php:
-          - 8.0
-          - 8.1
-          - 8.2
+          - 8.3
 
         mariadb:
           - mariadb:10.4
@@ -44,6 +43,14 @@ jobs:
           - mariadb:10.9
           - mariadb:latest
 
+        include:
+          - php: 8.0
+            mariadb: mariadb:latest
+          - php: 8.1
+            mariadb: mariadb:latest
+          - php: 8.2
+            mariadb: mariadb:latest
+
     services:
       mysql:
         image: ${{ matrix.mariadb }}
@@ -86,7 +93,7 @@ jobs:
         run: vendor/bin/phpunit --testsuite Mysql --coverage-clover=coverage.xml --colors=always
 
       - name: Upload coverage to Codecov.
-        if: matrix.php == '8.1'
+        if: matrix.php == '8.3'
         uses: codecov/codecov-action@v3
         with:
           token: ${{ secrets.CODECOV_TOKEN }}

diff --git a/.github/workflows/db-mssql.yml b/.github/workflows/db-mssql.yml
@@ -2,61 +2,69 @@ on:
   pull_request:
     paths:
       - 'src/**'
+      - 'tests/**'
       - '.github/workflows/db-mssql.yml'
       - 'composer.json'
+      - 'phpunit.xml.dist'
 
   push:
     branches: ['master']
     paths:
       - 'src/**'
+      - 'tests/**'
       - '.github/workflows/db-mssql.yml'
       - 'composer.json'
+      - 'phpunit.xml.dist'
 
 name: db-mssql
 
 jobs:
   tests:
-    name: PHP ${{ matrix.php }}-mssql-${{ matrix.mssql }}
+    name: PHP ${{ matrix.php }}-mssql-${{ matrix.mssql.server }}
 
     env:
       COMPOSER_ROOT_VERSION: dev-master
       CURRENT_PACKAGE: db-mssql
       EXTENSIONS: pdo, pdo_sqlsrv-5.10.1
 
-    runs-on: ${{ matrix.os }}
+    runs-on: ubuntu-latest
 
     strategy:
       matrix:
-        os:
-          - ubuntu-latest
-
         php:
           - 8.0
           - 8.1
           - 8.2
+          - 8.3
 
         mssql:
-          - server:2017-latest
-          - server:2019-latest
-          - server:2022-latest
+          - server: 2022-latest
+            odbc-version: 18
+            flag: "-C"
+
+        include:
+          - php: 8.3
+            mssql: { server: 2017-latest }
+          - php: 8.3
+            mssql: { server: 2019-latest }
 
     services:
       mssql:
-          image: mcr.microsoft.com/mssql/${{ matrix.mssql }}
+          image: mcr.microsoft.com/mssql/server:${{ matrix.mssql.server }}
           env:
               SA_PASSWORD: YourStrong!Passw0rd
               ACCEPT_EULA: Y
               MSSQL_PID: Developer
           ports:
               - 1433:1433
-          options: --name=mssql --health-cmd="/opt/mssql-tools/bin/sqlcmd -S localhost -U SA -P 'YourStrong!Passw0rd' -Q 'SELECT 1'" --health-interval=10s --health-timeout=5s --health-retries=3
+          options: --name=mssql --health-cmd="/opt/mssql-tools${{ matrix.mssql.odbc-version }}/bin/sqlcmd ${{ matrix.mssql.flag }} -S localhost -U SA -P 'YourStrong!Passw0rd' -Q 'SELECT 1'" --health-interval=10s --health-timeout=5s --health-retries=3
 
     steps:
       - name: Checkout.
         uses: actions/checkout@v3
 
       - name: Create MS SQL Database.
-        run: docker exec -i mssql /opt/mssql-tools/bin/sqlcmd -S localhost -U SA -P 'YourStrong!Passw0rd' -Q 'CREATE DATABASE yiitest'
+        run: docker exec -i mssql /opt/mssql-tools${{ matrix.mssql.odbc-version }}/bin/sqlcmd ${{ matrix.mssql.flag }} -S localhost -U SA -P 'YourStrong!Passw0rd' -Q 'CREATE DATABASE yiitest'
 
       - name: Install PHP with extensions.
         uses: shivammathur/setup-php@v2
@@ -88,7 +96,7 @@ jobs:
         run: vendor/bin/phpunit --testsuite Mssql --coverage-clover=coverage.xml --colors=always
 
       - name: Upload coverage to Codecov.
-        if: matrix.php == '8.1'
+        if: matrix.php == '8.3'
         uses: codecov/codecov-action@v3
         with:
           token: ${{ secrets.CODECOV_TOKEN }}

diff --git a/.github/workflows/db-mysql.yml b/.github/workflows/db-mysql.yml
@@ -2,15 +2,19 @@ on:
   pull_request:
     paths:
       - 'src/**'
+      - 'tests/**'
       - '.github/workflows/db-mysql.yml'
       - 'composer.json'
+      - 'phpunit.xml.dist'
 
   push:
     branches: ['master']
     paths:
       - 'src/**'
+      - 'tests/**'
       - '.github/workflows/db-mysql.yml'
       - 'composer.json'
+      - 'phpunit.xml.dist'
 
 name: db-mysql
 
@@ -23,22 +27,25 @@ jobs:
       CURRENT_PACKAGE: db-mysql
       EXTENSIONS: pdo, pdo_mysql
 
-    runs-on: ${{ matrix.os }}
+    runs-on: ubuntu-latest
 
     strategy:
       matrix:
-        os:
-          - ubuntu-latest
-
         php:
-          - 8.0
-          - 8.1
-          - 8.2
+          - 8.3
 
         mysql:
           - mysql:5.7
           - mysql:latest
 
+        include:
+          - php: 8.0
+            mysql: mysql:latest
+          - php: 8.1
+            mysql: mysql:latest
+          - php: 8.2
+            mysql: mysql:latest
+
     services:
       mysql:
         image: ${{ matrix.mysql }}
@@ -81,7 +88,7 @@ jobs:
         run: vendor/bin/phpunit --testsuite Mysql --coverage-clover=coverage.xml --colors=always
 
       - name: Upload coverage to Codecov.
-        if: matrix.php == '8.1'
+        if: matrix.php == '8.3'
         uses: codecov/codecov-action@v3
         with:
           token: ${{ secrets.CODECOV_TOKEN }}

diff --git a/.github/workflows/db-oracle.yml b/.github/workflows/db-oracle.yml
@@ -2,15 +2,19 @@ on:
   pull_request:
     paths:
       - 'src/**'
+      - 'tests/**'
       - '.github/workflows/db-oracle.yml'
       - 'composer.json'
+      - 'phpunit.xml.dist'
 
   push:
     branches: ['master']
     paths:
       - 'src/**'
+      - 'tests/**'
       - '.github/workflows/db-oracle.yml'
       - 'composer.json'
+      - 'phpunit.xml.dist'
 
 name: db-oracle
 
@@ -23,22 +27,25 @@ jobs:
       COMPOSER_ROOT_VERSION: dev-master
       EXTENSIONS: pdo, pdo_oci
 
-    runs-on: ${{ matrix.os }}
+    runs-on: ubuntu-latest
 
     strategy:
       matrix:
-        os:
-          - ubuntu-latest
-
         php:
-          - 8.0
-          - 8.1
-          - 8.2
+          - 8.3
 
         oracle:
           - 18
           - 21
 
+        include:
+          - php: 8.0
+            oracle: 21
+          - php: 8.1
+            oracle: 21
+          - php: 8.2
+            oracle: 21
+
     services:
       oci:
         image: gvenzl/oracle-xe:${{ matrix.oracle }}
@@ -86,7 +93,7 @@ jobs:
         run: vendor/bin/phpunit --testsuite Oracle --coverage-clover=coverage.xml --colors=always
 
       - name: Upload coverage to Codecov.
-        if: matrix.php == '8.1'
+        if: matrix.php == '8.3'
         uses: codecov/codecov-action@v3
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
-Original file line number
+Diff line change
@@ Expand Up / @@ -20,4 +20,4 @@ jobs: @@
           os: >-
             ['ubuntu-latest']
           php: >-
-            ['8.1']
+            ['8.3']