Full matrix for Linux CI, move Python tests to the end

ClickHouse · Sep 17, 2024 · 80994f3 · 80994f3
1 parent d98ad5c
commit 80994f3
Showing 1 changed file with 20 additions and 20 deletions.
diff --git a/.github/workflows/Linux.yml b/.github/workflows/Linux.yml
@@ -27,12 +27,12 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-22.04]
-        odbc_provider: [UnixODBC]
-        compiler: [Clang]
-        build_type: [Debug]
+        odbc_provider: [UnixODBC, iODBC]
+        compiler: [Clang, GCC]
+        build_type: [Debug, Release]
         architecture: [x86_64]
-        runtime_link: [static-runtime]
-        third_parties: [system-third-parties]
+        runtime_link: [static-runtime, dynamic-runtime]
+        third_parties: [bundled-third-parties, system-third-parties]
         # exclude:
         #   - os: ubuntu-18.04
         #     compiler: Clang
@@ -183,13 +183,25 @@ jobs:
         DriverLogFile = ${{ github.workspace }}/run/clickhouse-odbc-driver.log
         EOF
 
+    # Run all tests except those that were run in "Test - unit tests" step.
+    - name: Test - Run C++ integration tests
+      working-directory: ${{ github.workspace }}/build
+      run: |
+        export ODBCSYSINI=
+        export ODBCINSTINI="${{ github.workspace }}/run/.odbcinst.ini"
+        export ODBCINI="${{ github.workspace }}/run/.odbc.ini"
+        if [[ "${{ matrix.odbc_provider }}" == "iODBC" ]]; then
+          export GTEST_FILTER="-PerformanceTest.*"
+        fi
+        ctest --output-on-failure --build-config ${{ matrix.build_type }} -E '.*-ut.*'
+
     - name: Prepare Python dependencies
       working-directory: source/test
       run: |
         pip install -r requirements.txt
 
-    # An empty `ODBCSYSINI` is required in this case to run properly with custom `ODBCINI`/`ODBCINSTINI` paths
-    - name: Test - run Python e2e tests
+      # An empty `ODBCSYSINI` is required in this case to run properly with custom `ODBCINI`/`ODBCINSTINI` paths
+    - name: Test - Run Python e2e tests
       working-directory: source/test
       run: |
         export ODBCSYSINI=
@@ -199,16 +211,4 @@ jobs:
           # Full path to a custom odbcinst.ini in ODBCINSTINI for iODBC.
           export ODBCINSTINI=$ODBCSYSINI/$ODBCINSTINI
         fi
-        pytest
-
-    # Run all tests except those that were run in "Test - unit tests" step.
-    - name: Test - Run C++ integration tests
-      working-directory: ${{ github.workspace }}/build
-      run: |
-        export ODBCSYSINI=
-        export ODBCINSTINI="${{ github.workspace }}/run/.odbcinst.ini"
-        export ODBCINI="${{ github.workspace }}/run/.odbc.ini"
-        if [[ "${{ matrix.odbc_provider }}" == "iODBC" ]]; then
-          export GTEST_FILTER="-PerformanceTest.*"
-        fi
-        ctest --output-on-failure --build-config ${{ matrix.build_type }} -E '.*-ut.*'
+        pytest