Skip to content

Commit 83403d3

Browse files
committed
Update Appveyor build to MySQL 8.0.
This mirrors changes other projects have made in response to this issue: appveyor/ci#3894
1 parent d89918c commit 83403d3

File tree

4 files changed

+13
-10
lines changed

4 files changed

+13
-10
lines changed

.ci/config/config.compression.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
"Data": {
3-
"ConnectionString": "server=127.0.0.1;user id=mysqltest;password=test;port=3306;database=mysqltest;ssl mode=none;UseCompression=true;DefaultCommandTimeout=3600",
3+
"ConnectionString": "server=127.0.0.1;user id=mysqltest;password=test;port=3306;database=mysqltest;ssl mode=none;UseCompression=true;DefaultCommandTimeout=3600;AllowPublicKeyRetrieval=true",
44
"SocketPath": "./../../../../.ci/run/mysql/mysqld.sock",
55
"PasswordlessUser": "no_password",
66
"SecondaryDatabase": "testdb2",
7-
"UnsupportedFeatures": "Ed25519,RsaEncryption,CachingSha2Password,QueryAttributes,Tls12,Tls13,UnixDomainSocket,UuidToBin",
7+
"UnsupportedFeatures": "Ed25519,QueryAttributes,StreamingResults,Tls11,UnixDomainSocket,ZeroDateTime",
88
"MySqlBulkLoaderLocalCsvFile": "../../../../tests/TestData/LoadData_UTF8_BOM_Unix.CSV",
99
"MySqlBulkLoaderLocalTsvFile": "../../../../tests/TestData/LoadData_UTF8_BOM_Unix.TSV"
1010
}

.ci/config/config.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
"Data": {
3-
"ConnectionString": "server=127.0.0.1;user id=mysqltest;password=test;port=3306;database=mysqltest;ssl mode=none;DefaultCommandTimeout=3600",
3+
"ConnectionString": "server=127.0.0.1;user id=mysqltest;password=test;port=3306;database=mysqltest;ssl mode=none;DefaultCommandTimeout=3600;AllowPublicKeyRetrieval=true",
44
"SocketPath": "./../../../../.ci/run/mysql/mysqld.sock",
55
"PasswordlessUser": "no_password",
66
"SecondaryDatabase": "testdb2",
7-
"UnsupportedFeatures": "Ed25519,RsaEncryption,CachingSha2Password,QueryAttributes,Tls12,Tls13,UnixDomainSocket,UuidToBin",
7+
"UnsupportedFeatures": "Ed25519,QueryAttributes,StreamingResults,Tls11,UnixDomainSocket,ZeroDateTime",
88
"MySqlBulkLoaderLocalCsvFile": "../../../../tests/TestData/LoadData_UTF8_BOM_Unix.CSV",
99
"MySqlBulkLoaderLocalTsvFile": "../../../../tests/TestData/LoadData_UTF8_BOM_Unix.TSV"
1010
}

appveyor.yml

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
image: Previous Visual Studio 2022
2-
services:
3-
- mysql
1+
image: Visual Studio 2022
42
environment:
53
global:
64
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
@@ -15,9 +13,14 @@ install:
1513
build_script:
1614
- dotnet --info
1715
before_test:
16+
- ps: Start-Service MySQL80
1817
- cmd: |-
19-
"C:\Program Files\MySQL\MySQL Server 5.7\bin\mysql.exe" -u root --password=Password12! < .ci\server\init.sql
20-
"C:\Program Files\MySQL\MySQL Server 5.7\bin\mysql.exe" -u root --password=Password12! < .ci\server\init_sha256.sql
18+
"C:\Program Files\MySQL\MySQL Server 8.0\bin\mysql.exe" -u root --password=Password12! -e "SET GLOBAL log_bin_trust_function_creators = 1;"
19+
"C:\Program Files\MySQL\MySQL Server 8.0\bin\mysql.exe" -u root --password=Password12! -e "SET GLOBAL local_infile = 1;"
20+
"C:\Program Files\MySQL\MySQL Server 8.0\bin\mysql.exe" -u root --password=Password12! -e "SET GLOBAL max_connections = 250;"
21+
"C:\Program Files\MySQL\MySQL Server 8.0\bin\mysql.exe" -u root --password=Password12! < .ci\server\init.sql
22+
"C:\Program Files\MySQL\MySQL Server 8.0\bin\mysql.exe" -u root --password=Password12! < .ci\server\init_sha256.sql
23+
"C:\Program Files\MySQL\MySQL Server 8.0\bin\mysql.exe" -u root --password=Password12! < .ci\server\init_caching_sha2.sql
2124
test_script:
2225
- ps: .\.ci\test.ps1
2326
after_test:

tests/Conformance.Tests/DbFactoryFixture.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ public class DbFactoryFixture : IDbFactoryFixture
99
{
1010
public DbFactoryFixture()
1111
{
12-
ConnectionString = Environment.GetEnvironmentVariable("CONNECTION_STRING") ?? "Server=localhost;User Id=mysqltest;Password=test;SSL Mode=None";
12+
ConnectionString = Environment.GetEnvironmentVariable("CONNECTION_STRING") ?? "Server=localhost;User Id=mysqltest;Password=test;SSL Mode=None;AllowPublicKeyRetrieval=true";
1313
}
1414

1515
public string ConnectionString { get; }

0 commit comments

Comments
 (0)