Skip to content

Commit

Permalink
Update Appveyor build to MySQL 8.0.
Browse files Browse the repository at this point in the history
This mirrors changes other projects have made in response to this issue: appveyor/ci#3894
  • Loading branch information
bgrainger committed Dec 5, 2023
1 parent d89918c commit 83403d3
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 10 deletions.
4 changes: 2 additions & 2 deletions .ci/config/config.compression.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"Data": {
"ConnectionString": "server=127.0.0.1;user id=mysqltest;password=test;port=3306;database=mysqltest;ssl mode=none;UseCompression=true;DefaultCommandTimeout=3600",
"ConnectionString": "server=127.0.0.1;user id=mysqltest;password=test;port=3306;database=mysqltest;ssl mode=none;UseCompression=true;DefaultCommandTimeout=3600;AllowPublicKeyRetrieval=true",
"SocketPath": "./../../../../.ci/run/mysql/mysqld.sock",
"PasswordlessUser": "no_password",
"SecondaryDatabase": "testdb2",
"UnsupportedFeatures": "Ed25519,RsaEncryption,CachingSha2Password,QueryAttributes,Tls12,Tls13,UnixDomainSocket,UuidToBin",
"UnsupportedFeatures": "Ed25519,QueryAttributes,StreamingResults,Tls11,UnixDomainSocket,ZeroDateTime",
"MySqlBulkLoaderLocalCsvFile": "../../../../tests/TestData/LoadData_UTF8_BOM_Unix.CSV",
"MySqlBulkLoaderLocalTsvFile": "../../../../tests/TestData/LoadData_UTF8_BOM_Unix.TSV"
}
Expand Down
4 changes: 2 additions & 2 deletions .ci/config/config.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"Data": {
"ConnectionString": "server=127.0.0.1;user id=mysqltest;password=test;port=3306;database=mysqltest;ssl mode=none;DefaultCommandTimeout=3600",
"ConnectionString": "server=127.0.0.1;user id=mysqltest;password=test;port=3306;database=mysqltest;ssl mode=none;DefaultCommandTimeout=3600;AllowPublicKeyRetrieval=true",
"SocketPath": "./../../../../.ci/run/mysql/mysqld.sock",
"PasswordlessUser": "no_password",
"SecondaryDatabase": "testdb2",
"UnsupportedFeatures": "Ed25519,RsaEncryption,CachingSha2Password,QueryAttributes,Tls12,Tls13,UnixDomainSocket,UuidToBin",
"UnsupportedFeatures": "Ed25519,QueryAttributes,StreamingResults,Tls11,UnixDomainSocket,ZeroDateTime",
"MySqlBulkLoaderLocalCsvFile": "../../../../tests/TestData/LoadData_UTF8_BOM_Unix.CSV",
"MySqlBulkLoaderLocalTsvFile": "../../../../tests/TestData/LoadData_UTF8_BOM_Unix.TSV"
}
Expand Down
13 changes: 8 additions & 5 deletions appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
image: Previous Visual Studio 2022
services:
- mysql
image: Visual Studio 2022
environment:
global:
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
Expand All @@ -15,9 +13,14 @@ install:
build_script:
- dotnet --info
before_test:
- ps: Start-Service MySQL80
- cmd: |-
"C:\Program Files\MySQL\MySQL Server 5.7\bin\mysql.exe" -u root --password=Password12! < .ci\server\init.sql
"C:\Program Files\MySQL\MySQL Server 5.7\bin\mysql.exe" -u root --password=Password12! < .ci\server\init_sha256.sql
"C:\Program Files\MySQL\MySQL Server 8.0\bin\mysql.exe" -u root --password=Password12! -e "SET GLOBAL log_bin_trust_function_creators = 1;"
"C:\Program Files\MySQL\MySQL Server 8.0\bin\mysql.exe" -u root --password=Password12! -e "SET GLOBAL local_infile = 1;"
"C:\Program Files\MySQL\MySQL Server 8.0\bin\mysql.exe" -u root --password=Password12! -e "SET GLOBAL max_connections = 250;"
"C:\Program Files\MySQL\MySQL Server 8.0\bin\mysql.exe" -u root --password=Password12! < .ci\server\init.sql
"C:\Program Files\MySQL\MySQL Server 8.0\bin\mysql.exe" -u root --password=Password12! < .ci\server\init_sha256.sql
"C:\Program Files\MySQL\MySQL Server 8.0\bin\mysql.exe" -u root --password=Password12! < .ci\server\init_caching_sha2.sql
test_script:
- ps: .\.ci\test.ps1
after_test:
Expand Down
2 changes: 1 addition & 1 deletion tests/Conformance.Tests/DbFactoryFixture.cs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ public class DbFactoryFixture : IDbFactoryFixture
{
public DbFactoryFixture()
{
ConnectionString = Environment.GetEnvironmentVariable("CONNECTION_STRING") ?? "Server=localhost;User Id=mysqltest;Password=test;SSL Mode=None";
ConnectionString = Environment.GetEnvironmentVariable("CONNECTION_STRING") ?? "Server=localhost;User Id=mysqltest;Password=test;SSL Mode=None;AllowPublicKeyRetrieval=true";
}

public string ConnectionString { get; }
Expand Down

0 comments on commit 83403d3

Please sign in to comment.