WIP rt refactors

launchbadge · Aug 24, 2022 · 9ae5cc1 · 9ae5cc1
1 parent 0e5b9a1
commit 9ae5cc1
Show file tree

Hide file tree

Showing 75 changed files with 2,156 additions and 1,143 deletions.
diff --git a/.github/workflows/sqlx.yml b/.github/workflows/sqlx.yml
@@ -33,7 +33,7 @@ jobs:
     strategy:
       matrix:
         runtime: [async-std, tokio, actix]
-        tls: [native-tls, rustls]
+        tls: [native, rustls, none]
     steps:
       - uses: actions/checkout@v2
 
@@ -53,22 +53,22 @@ jobs:
           args: >
             --manifest-path sqlx-core/Cargo.toml
             --no-default-features
-            --features offline,all-databases,all-types,migrate,runtime-${{ matrix.runtime }}-${{ matrix.tls }}
+            --features offline,all-databases,all-types,migrate,runtime-${{ matrix.runtime }},tls-${{ matrix.tls }}
 
       - uses: actions-rs/cargo@v1
         with:
           command: check
           args: >
             --no-default-features
-            --features offline,all-databases,all-types,migrate,runtime-${{ matrix.runtime }}-${{ matrix.tls }},macros
+            --features offline,all-databases,all-types,migrate,runtime-${{ matrix.runtime }},tls-${{ matrix.tls }},macros
 
   test:
     name: Unit Test
     runs-on: ubuntu-20.04
     strategy:
       matrix:
         runtime: [async-std, tokio, actix]
-        tls: [native-tls, rustls]
+        tls: [native, rustls, none]
     steps:
       - uses: actions/checkout@v2
 
@@ -87,7 +87,7 @@ jobs:
           command: test
           args: >
             --manifest-path sqlx-core/Cargo.toml
-            --features offline,all-databases,all-types,runtime-${{ matrix.runtime }}-${{ matrix.tls }}
+            --features offline,all-databases,all-types,runtime-${{ matrix.runtime }},tls-${{ matrix.tls }}
 
   cli:
     name: CLI Binaries
@@ -139,7 +139,6 @@ jobs:
     strategy:
       matrix:
         runtime: [async-std, tokio, actix]
-        tls: [native-tls, rustls]
     needs: check
     steps:
       - uses: actions/checkout@v2
@@ -159,7 +158,7 @@ jobs:
           command: test
           args: >
             --no-default-features
-            --features any,macros,migrate,sqlite,all-types,runtime-${{ matrix.runtime }}-${{ matrix.tls }}
+            --features any,macros,migrate,sqlite,all-types,runtime-${{ matrix.runtime }}
             --
             --test-threads=1
         env:
@@ -172,7 +171,7 @@ jobs:
       matrix:
         postgres: [14, 10]
         runtime: [async-std, tokio, actix]
-        tls: [native-tls, rustls]
+        tls: [native, rustls, none]
     needs: check
     steps:
       - uses: actions/checkout@v2
@@ -195,7 +194,7 @@ jobs:
         with:
           command: build
           args: >
-            --features postgres,all-types,runtime-${{ matrix.runtime }}-${{ matrix.tls }}
+            --features postgres,all-types,runtime-${{ matrix.runtime }},tls-${{ matrix.tls }}
 
       - run: |
           docker-compose -f tests/docker-compose.yml run -d -p 5432:5432 --name postgres_${{ matrix.postgres }} postgres_${{ matrix.postgres }}
@@ -206,19 +205,20 @@ jobs:
           command: test
           args: >
             --no-default-features
-            --features any,postgres,macros,all-types,runtime-${{ matrix.runtime }}-${{ matrix.tls }}
+            --features any,postgres,macros,all-types,runtime-${{ matrix.runtime }},tls-${{ matrix.tls }}
         env:
           DATABASE_URL: postgres://postgres:password@localhost:5432/sqlx
           # FIXME: needed to disable `ltree` tests in Postgres 9.6
           # but `PgLTree` should just fall back to text format
           RUSTFLAGS: --cfg postgres_${{ matrix.postgres }}
 
       - uses: actions-rs/cargo@v1
+        if: matrix.tls != 'none'
         with:
           command: test
           args: >
             --no-default-features
-            --features any,postgres,macros,migrate,all-types,runtime-${{ matrix.runtime }}-${{ matrix.tls }}
+            --features any,postgres,macros,migrate,all-types,runtime-${{ matrix.runtime }},tls-${{ matrix.tls }}
         env:
           DATABASE_URL: postgres://postgres:password@localhost:5432/sqlx?sslmode=verify-ca&sslrootcert=.%2Ftests%2Fcerts%2Fca.crt
           # FIXME: needed to disable `ltree` tests in Postgres 9.6
@@ -232,7 +232,7 @@ jobs:
       matrix:
         mysql: [8, 5_7]
         runtime: [async-std, tokio, actix]
-        tls: [native-tls, rustls]
+        tls: [native, rustls, none]
     needs: check
     steps:
       - uses: actions/checkout@v2
@@ -251,7 +251,7 @@ jobs:
         with:
           command: build
           args: >
-            --features mysql,all-types,runtime-${{ matrix.runtime }}-${{ matrix.tls }}
+            --features mysql,all-types,runtime-${{ matrix.runtime }},tls-${{ matrix.tls }}
 
       - run: docker-compose -f tests/docker-compose.yml run -d -p 3306:3306 mysql_${{ matrix.mysql }}
       - run: sleep 60
@@ -261,7 +261,7 @@ jobs:
           command: test
           args: >
             --no-default-features
-            --features any,mysql,macros,migrate,all-types,runtime-${{ matrix.runtime }}-${{ matrix.tls }}
+            --features any,mysql,macros,migrate,all-types,runtime-${{ matrix.runtime }},tls-${{ matrix.tls }}
         env:
           DATABASE_URL: mysql://root:password@localhost:3306/sqlx?ssl-mode=disabled
 
@@ -272,7 +272,7 @@ jobs:
           command: test
           args: >
             --no-default-features
-            --features any,mysql,macros,migrate,all-types,runtime-${{ matrix.runtime }}-${{ matrix.tls }}
+            --features any,mysql,macros,migrate,all-types,runtime-${{ matrix.runtime }},tls-${{ matrix.tls }}
         env:
           DATABASE_URL: mysql://root:password@localhost:3306/sqlx
 
@@ -283,7 +283,7 @@ jobs:
       matrix:
         mariadb: [10_6, 10_3]
         runtime: [async-std, tokio, actix]
-        tls: [native-tls, rustls]
+        tls: [native, rustls, none]
     needs: check
     steps:
       - uses: actions/checkout@v2
@@ -312,7 +312,7 @@ jobs:
           command: test
           args: >
             --no-default-features
-            --features any,mysql,macros,migrate,all-types,runtime-${{ matrix.runtime }}-${{ matrix.tls }}
+            --features any,mysql,macros,migrate,all-types,runtime-${{ matrix.runtime }},tls-${{ matrix.tls }}
         env:
           DATABASE_URL: mysql://root:password@localhost:3306/sqlx
 
@@ -323,7 +323,7 @@ jobs:
       matrix:
         mssql: [2019, 2017]
         runtime: [async-std, tokio, actix]
-        tls: [native-tls, rustls]
+        tls: [native, rustls, none]
     needs: check
     steps:
       - uses: actions/checkout@v2
@@ -352,6 +352,6 @@ jobs:
           command: test
           args: >
             --no-default-features
-            --features any,mssql,macros,migrate,all-types,runtime-${{ matrix.runtime }}-${{ matrix.tls }}
+            --features any,mssql,macros,migrate,all-types,runtime-${{ matrix.runtime }},tls-${{ matrix.tls }}
         env:
           DATABASE_URL: mssql://sa:Password123!@localhost/sqlx
diff --git a/Cargo.lock b/Cargo.lock