fix(ci): fix SQL Server 2017 (prisma#5003)

* fix(ci): add fix for SQL Server 2017 * fix(ci): fix schema-engine for SQL Server 2017 * fix(ci): forward ubuntu version to test-query-engine-template * chore: trigger Rust tests * chore(core-tests): undo changes to build.rs * chore: trigger Rust tests
metatypedev · Sep 23, 2024 · c57dd2b · c57dd2b
1 parent c9ff577
commit c57dd2b
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 3 deletions.
diff --git a/.github/workflows/test-query-engine-template.yml b/.github/workflows/test-query-engine-template.yml
@@ -12,6 +12,9 @@ on:
       version:
         type: string
         required: true
+      ubuntu:
+        type: string
+        default: 'latest'
       single_threaded:
         type: boolean
         default: false
@@ -46,7 +49,7 @@ jobs:
       PRISMA_ENGINE_PROTOCOL: ${{ matrix.engine_protocol }}
       PRISMA_RELATION_LOAD_STRATEGY: ${{ matrix.relation_load_strategy }}
 
-    runs-on: ubuntu-latest
+    runs-on: "ubuntu-${{ inputs.ubuntu }}"
     steps:
       - uses: actions/checkout@v4
       - uses: actions-rust-lang/setup-rust-toolchain@v1

diff --git a/.github/workflows/test-query-engine.yml b/.github/workflows/test-query-engine.yml
@@ -126,11 +126,13 @@ jobs:
             version: "2019"
           - name: "mssql_2017"
             version: "2017"
+            ubuntu: "20.04"
     uses: ./.github/workflows/test-query-engine-template.yml
     name: mssql ${{ matrix.database.version }}
     with:
       name: ${{ matrix.database.name }}
       version: ${{ matrix.database.version }}
+      ubuntu: ${{ matrix.database.ubuntu }}
       connector: "sqlserver"
       relation_load_strategy: '["query"]'
 

diff --git a/.github/workflows/test-schema-engine.yml b/.github/workflows/test-schema-engine.yml
@@ -62,6 +62,7 @@ jobs:
         database:
           - name: mssql_2017
             url: "sqlserver://localhost:1434;database=master;user=SA;password=<YourStrong@Passw0rd>;trustServerCertificate=true;socket_timeout=60;isolationLevel=READ UNCOMMITTED"
+            ubuntu: "20.04"
           - name: mssql_2019
             url: "sqlserver://localhost:1433;database=master;user=SA;password=<YourStrong@Passw0rd>;trustServerCertificate=true;socket_timeout=60;isolationLevel=READ UNCOMMITTED"
           - name: mssql_2022
@@ -104,7 +105,7 @@ jobs:
             is_vitess: true
             single_threaded: true
 
-    runs-on: ubuntu-latest
+    runs-on: "ubuntu-${{ matrix.database.ubuntu || 'latest' }}"
     steps:
       - uses: actions/checkout@v4
       - uses: actions-rust-lang/setup-rust-toolchain@v1

diff --git a/schema-engine/cli/tests/cli_tests.rs b/schema-engine/cli/tests/cli_tests.rs
@@ -51,7 +51,7 @@ where
                 .or_else(|| panic_payload.downcast_ref::<String>().map(|s| s.to_owned()))
                 .unwrap_or_default();
 
-            panic!("Error: '{}'", res)
+            panic!("Error: '{}'", res);
         }
     }
 }