Skip to content

Commit 8ff9c06

Browse files
committed
Fix features in CI
1 parent 8eb1e43 commit 8ff9c06

File tree

3 files changed

+12
-12
lines changed

3 files changed

+12
-12
lines changed

.github/workflows/sqlx.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ jobs:
244244
command: test
245245
args: >
246246
--no-default-features
247-
--features any,postgres,macros,migrate,all-types,runtime-${{ matrix.runtime }},tls-${{ matrix.tls }}
247+
--features any,postgres,macros,_unstable-all-types,runtime-${{ matrix.runtime }},tls-${{ matrix.tls }}
248248
env:
249249
DATABASE_URL: postgres://postgres@localhost:5432/sqlx?sslmode=verify-ca&sslrootcert=.%2Ftests%2Fcerts%2Fca.crt&sslkey=.%2Ftests%2Fkeys%2Fclient.key&sslcert=.%2Ftests%2Fcerts%2Fclient.crt
250250
# FIXME: needed to disable `ltree` tests in Postgres 9.6
@@ -318,7 +318,7 @@ jobs:
318318
command: test
319319
args: >
320320
--no-default-features
321-
--features any,mysql,macros,migrate,all-types,runtime-${{ matrix.runtime }},tls-${{ matrix.tls }}
321+
--features any,mysql,macros,_unstable-all-types,runtime-${{ matrix.runtime }},tls-${{ matrix.tls }}
322322
env:
323323
DATABASE_URL: mysql://root@localhost:3306/sqlx?sslmode=verify_ca&ssl-ca=.%2Ftests%2Fcerts%2Fca.crt&ssl-key=.%2Ftests%2Fkeys%2Fclient.key&ssl-cert=.%2Ftests%2Fcerts%2Fclient.crt
324324
RUSTFLAGS: --cfg mysql_${{ matrix.mysql }}
@@ -376,7 +376,7 @@ jobs:
376376
command: test
377377
args: >
378378
--no-default-features
379-
--features any,mysql,macros,migrate,all-types,runtime-${{ matrix.runtime }},tls-${{ matrix.tls }}
379+
--features any,mysql,macros,_unstable-all-types,runtime-${{ matrix.runtime }},tls-${{ matrix.tls }}
380380
env:
381381
DATABASE_URL: mysql://root@localhost:3306/sqlx?sslmode=verify_ca&ssl-ca=.%2Ftests%2Fcerts%2Fca.crt&ssl-key=.%2Ftests%2Fkeys%2Fclient.key&ssl-cert=.%2Ftests%2Fcerts%2Fclient.crt
382382
RUSTFLAGS: --cfg mariadb_${{ matrix.mariadb }}

tests/sqlite/sqlite.db

0 Bytes
Binary file not shown.

tests/x.py

+9-9
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ def run(command, comment=None, env=None, service=None, tag=None, args=None, data
142142
for runtime in ["async-std", "tokio"]:
143143
for tls in ["native-tls", "rustls", "none"]:
144144
run(
145-
f"cargo test --no-default-features --manifest-path sqlx-core/Cargo.toml --features json,_rt-{runtime},_tls-{tls}",
145+
f"cargo test --no-default-features --manifest-path sqlx-core/Cargo.toml --features json,offline,migrate,_rt-{runtime},_tls-{tls}",
146146
comment="unit test core",
147147
tag=f"unit_{runtime}_{tls}"
148148
)
@@ -159,7 +159,7 @@ def run(command, comment=None, env=None, service=None, tag=None, args=None, data
159159
#
160160

161161
run(
162-
f"cargo test --no-default-features --features macros,any,_unstable-all-types,sqlite,runtime-{runtime},tls-{tls}",
162+
f"cargo test --no-default-features --features any,sqlite,macros,_unstable-all-types,runtime-{runtime},tls-{tls}",
163163
comment=f"test sqlite",
164164
service="sqlite",
165165
tag=f"sqlite" if runtime == "async-std" else f"sqlite_{runtime}",
@@ -171,7 +171,7 @@ def run(command, comment=None, env=None, service=None, tag=None, args=None, data
171171

172172
for version in ["14", "13", "12", "11", "10"]:
173173
run(
174-
f"cargo test --no-default-features --features macros,any,_unstable-all-types,postgres,runtime-{runtime},tls-{tls}",
174+
f"cargo test --no-default-features --features any,postgres,macros,_unstable-all-types,runtime-{runtime},tls-{tls}",
175175
comment=f"test postgres {version}",
176176
service=f"postgres_{version}",
177177
tag=f"postgres_{version}" if runtime == "async-std" else f"postgres_{version}_{runtime}",
@@ -181,7 +181,7 @@ def run(command, comment=None, env=None, service=None, tag=None, args=None, data
181181
## +ssl
182182
for version in ["14", "13", "12", "11", "10"]:
183183
run(
184-
f"cargo test --no-default-features --features macros,any,_unstable-all-types,postgres,runtime-{runtime},tls-{tls}",
184+
f"cargo test --no-default-features --features any,postgres,macros,_unstable-all-types,runtime-{runtime},tls-{tls}",
185185
comment=f"test postgres {version} ssl",
186186
database_url_args="sslmode=verify-ca&sslrootcert=.%2Ftests%2Fcerts%2Fca.crt",
187187
service=f"postgres_{version}",
@@ -191,7 +191,7 @@ def run(command, comment=None, env=None, service=None, tag=None, args=None, data
191191
## +client-ssl
192192
for version in ["14_client_ssl", "13_client_ssl", "12_client_ssl", "11_client_ssl", "10_client_ssl"]:
193193
run(
194-
f"cargo test --no-default-features --features macros,any,_unstable-all-types,postgres,runtime-{runtime},tls-{tls}",
194+
f"cargo test --no-default-features --features any,postgres,macros,_unstable-all-types,runtime-{runtime},tls-{tls}",
195195
comment=f"test postgres {version} no-password",
196196
database_url_args="sslmode=verify-ca&sslrootcert=.%2Ftests%2Fcerts%2Fca.crt&sslkey=.%2Ftests%2Fkeys%2Fclient.key&sslcert=.%2Ftests%2Fcerts%2Fclient.crt",
197197
service=f"postgres_{version}",
@@ -204,7 +204,7 @@ def run(command, comment=None, env=None, service=None, tag=None, args=None, data
204204

205205
for version in ["8", "5_7"]:
206206
run(
207-
f"cargo test --no-default-features --features macros,any,_unstable-all-types,mysql,runtime-{runtime},tls-{tls}",
207+
f"cargo test --no-default-features --features any,mysql,macros,_unstable-all-types,runtime-{runtime},tls-{tls}",
208208
comment=f"test mysql {version}",
209209
service=f"mysql_{version}",
210210
tag=f"mysql_{version}" if runtime == "async-std" else f"mysql_{version}_{runtime}",
@@ -214,7 +214,7 @@ def run(command, comment=None, env=None, service=None, tag=None, args=None, data
214214
## +client-ssl
215215
for version in ["8_client_ssl", "5_7_client_ssl"]:
216216
run(
217-
f"cargo test --no-default-features --features macros,any,_unstable-all-types,mysql,runtime-{runtime},tls-{tls}",
217+
f"cargo test --no-default-features --features any,mysql,macros,_unstable-all-types,runtime-{runtime},tls-{tls}",
218218
comment=f"test mysql {version} no-password",
219219
database_url_args="sslmode=verify_ca&ssl-ca=.%2Ftests%2Fcerts%2Fca.crt&ssl-key=.%2Ftests%2Fkeys%2Fclient.key&ssl-cert=.%2Ftests%2Fcerts%2Fclient.crt",
220220
service=f"mysql_{version}",
@@ -227,7 +227,7 @@ def run(command, comment=None, env=None, service=None, tag=None, args=None, data
227227

228228
for version in ["10_6", "10_5", "10_4", "10_3"]:
229229
run(
230-
f"cargo test --no-default-features --features macros,any,_unstable-all-types,mysql,runtime-{runtime},tls-{tls}",
230+
f"cargo test --no-default-features --features any,mysql,macros,_unstable-all-types,runtime-{runtime},tls-{tls}",
231231
comment=f"test mariadb {version}",
232232
service=f"mariadb_{version}",
233233
tag=f"mariadb_{version}" if runtime == "async-std" else f"mariadb_{version}_{runtime}",
@@ -237,7 +237,7 @@ def run(command, comment=None, env=None, service=None, tag=None, args=None, data
237237
## +client-ssl
238238
for version in ["10_6_client_ssl", "10_5_client_ssl", "10_4_client_ssl", "10_3_client_ssl"]:
239239
run(
240-
f"cargo test --no-default-features --features macros,any,_unstable-all-types,mysql,runtime-{runtime},tls-{tls}",
240+
f"cargo test --no-default-features --features any,mysql,macros,_unstable-all-types,runtime-{runtime},tls-{tls}",
241241
comment=f"test mariadb {version} no-password",
242242
database_url_args="sslmode=verify_ca&ssl-ca=.%2Ftests%2Fcerts%2Fca.crt&ssl-key=.%2Ftests%2Fkeys%2Fclient.key&ssl-cert=.%2Ftests%2Fcerts%2Fclient.crt",
243243
service=f"mariadb_{version}",

0 commit comments

Comments
 (0)