Skip to content

Commit ef40088

Browse files
committed
Merge master into avoid-set-names.
Signed-off-by: Bradley Grainger <[email protected]>
2 parents 06d1f8c + e6bb115 commit ef40088

File tree

2 files changed

+0
-45
lines changed

2 files changed

+0
-45
lines changed

README.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,3 @@ Development of MySqlConnector is supported by:
113113
[![Faithlife](https://files.logoscdn.com/v1/files/4319104/content.svg?signature=3szVb3XmOfYMAxIv-LmuNYL_290)](https://faithlife.com/about)
114114

115115
[Faithlife](https://faithlife.com/about) ([View jobs](https://faithlife.com/careers))
116-
117-
[![Microsoft Azure](https://upload.wikimedia.org/wikipedia/commons/thumb/f/fa/Microsoft_Azure.svg/75px-Microsoft_Azure.svg.png)](https://azure.microsoft.com/en-us/overview/open-source/)
118-
119-
[Azure Credits for Open Source](https://opensource.microsoft.com/azure-credits)

azure-pipelines.yml

Lines changed: 0 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -102,47 +102,6 @@ jobs:
102102
image: 'mysql:8.0'
103103
connectionString: 'server=localhost;port=3306;user id=mysqltest;password=test;database=conformance;ssl mode=none;DefaultCommandTimeout=3600;AllowPublicKeyRetrieval=True'
104104

105-
- job: azure_mysql_integration_tests
106-
condition: ne('True', variables['System.PullRequest.IsFork'])
107-
displayName: 'Azure MySQL Integration Tests'
108-
pool:
109-
vmimage: 'windows-latest'
110-
steps:
111-
- task: PowerShell@2
112-
displayName: Create Database
113-
inputs:
114-
targetType: inline
115-
script: "mysql -u$(Azure MySQL Root User) -p$(Azure MySQL Root Password) -h '$(Azure MySQL Host)' -e 'create schema mysqltest_$(Build.BuildId) collate utf8mb4_0900_ai_ci;'"
116-
- task: UseDotNet@2
117-
displayName: 'Install .NET'
118-
inputs:
119-
version: $(DotNetCoreSdkVersion)
120-
- task: PowerShell@2
121-
displayName: 'Copy Azure config'
122-
inputs:
123-
targetType: inline
124-
script: Copy-Item -Path ".\.ci\config\config.ssl.json" -Destination ".\tests\IntegrationTests\config.json"
125-
- task: DotNetCoreCLI@2
126-
displayName: 'Restore packages'
127-
inputs:
128-
command: 'restore'
129-
- task: DotNetCoreCLI@2
130-
displayName: 'Integration tests (net8.0)'
131-
inputs:
132-
command: 'test'
133-
projects: 'tests/IntegrationTests/IntegrationTests.csproj'
134-
arguments: '-c Release -f net8.0 --no-restore'
135-
testRunTitle: ${{ format('{0}, $(Agent.OS), {1}, {2}', 'Azure', 'net8.0', 'SSL') }}
136-
env:
137-
DATA__UNSUPPORTEDFEATURES: 'CachingSha2Password,Ed25519,GlobalLog,KnownCertificateAuthority,QueryAttributes,RsaEncryption,Sha256Password,StreamingResults,Timeout,Tls11,Tls13,UnixDomainSocket,ZeroDateTime'
138-
DATA__CONNECTIONSTRING: "$(AzureConnectionString);database=mysqltest_$(Build.BuildId);ssl mode=Required;DefaultCommandTimeout=3600;AllowPublicKeyRetrieval=True"
139-
- task: PowerShell@2
140-
displayName: Drop Database
141-
condition: always()
142-
inputs:
143-
targetType: inline
144-
script: "mysql -u$(Azure MySQL Root User) -p$(Azure MySQL Root Password) -h '$(Azure MySQL Host)' -e 'drop schema if exists mysqltest_$(Build.BuildId);'"
145-
146105
- job: windows_integration_tests_1
147106
displayName: 'Windows Integration Tests (Part 1)'
148107
pool:

0 commit comments

Comments
 (0)