Skip to content

Commit b7ec634

Browse files
shueybubblesDavid Shiflet (from Dev Box)
andauthored
Update to go-mssqldb 1.9.2 (#591)
Co-authored-by: David Shiflet (from Dev Box) <[email protected]>
1 parent 6b98225 commit b7ec634

24 files changed

+5048
-2267
lines changed

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*.dylib
77
bin
88
obj
9-
9+
.vscode/*
1010
# Test binary, built with `go test -c`
1111
*.test
1212

.pipelines/TestSql2017.yml

Lines changed: 23 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
11
variables:
2-
# AZURE_CLIENT_SECRET and SQLPASSWORD must be defined as secret variables in the pipeline.
3-
# AZURE_TENANT_ID and AZURE_CLIENT_ID are not expected to be secret variables, just regular variables
4-
AZURECLIENTSECRET: $(AZURE_CLIENT_SECRET)
52
PASSWORD: $(SQLPASSWORD)
63
pool:
74
vmImage: 'ubuntu-latest'
@@ -21,34 +18,33 @@ steps:
2118
SQLCMDUSER: sa
2219
SQLPASSWORD: $(PASSWORD)
2320

24-
# The use of client secrets is disallowed now, so commenting out the Azure tests until we can switch to a federated credential.
25-
# - template: include-runtests-linux.yml
26-
# parameters:
27-
# RunName: 'SQLDB'
28-
# # AZURESERVER must be defined as a variable in the pipeline
29-
# SQLCMDSERVER: $(AZURESERVER)
30-
# AZURECLIENTSECRET: $(AZURECLIENTSECRET)
31-
32-
- task: Palmmedia.reportgenerator.reportgenerator-build-release-task.reportgenerator@4
33-
displayName: Merge coverage data
21+
- task: AzureCLI@2
3422
inputs:
35-
reports: '**/*.coverage.xml"' # REQUIRED # The coverage reports that should be parsed (separated by semicolon). Globbing is supported.
36-
targetdir: 'coverage' # REQUIRED # The directory where the generated report should be saved.
37-
reporttypes: 'HtmlInline_AzurePipelines;Cobertura' # The output formats and scope (separated by semicolon) Values: Badges, Clover, Cobertura, CsvSummary, Html, HtmlChart, HtmlInline, HtmlInline_AzurePipelines, HtmlInline_AzurePipelines_Dark, HtmlSummary, JsonSummary, Latex, LatexSummary, lcov, MarkdownSummary, MHtml, PngChart, SonarQube, TeamCitySummary, TextSummary, Xml, XmlSummary
38-
sourcedirs: '$(Build.SourcesDirectory)' # Optional directories which contain the corresponding source code (separated by semicolon). The source directories are used if coverage report contains classes without path information.
39-
verbosity: 'Info' # The verbosity level of the log messages. Values: Verbose, Info, Warning, Error, Off
40-
tag: '$(build.buildnumber)_#$(build.buildid)_$(Build.SourceBranchName)' # Optional tag or build version.
41-
- task: PublishCodeCoverageResults@1
23+
addSpnToEnvironment: true
24+
azureSubscription: $(AZURESUBSCRIPTION_SERVICE_CONNECTION_NAME)
25+
scriptType: pscore
26+
scriptLocation: inlineScript
27+
inlineScript: |
28+
Write-Host "##vso[task.setvariable variable=AZURESUBSCRIPTION_CLIENT_ID;]$env:AZURESUBSCRIPTION_CLIENT_ID"
29+
Write-Host "##vso[task.setvariable variable=AZURESUBSCRIPTION_TENANT_ID;]$env:AZURESUBSCRIPTION_TENANT_ID"
30+
gci env:* | sort-object name
31+
32+
- template: include-runtests-linux.yml
33+
parameters:
34+
RunName: 'SQLDB'
35+
# AZURESERVER must be defined as a variable in the pipeline
36+
SQLCMDSERVER: $(AZURESERVER)
37+
- task: UseDotNet@2
38+
inputs:
39+
packageType: 'runtime'
40+
version: '8.x'
41+
42+
- task: PublishCodeCoverageResults@2
4243
inputs:
43-
codeCoverageTool: Cobertura
4444
pathToSources: '$(Build.SourcesDirectory)'
45-
summaryFileLocation: $(Build.SourcesDirectory)/coverage/*.xml
46-
reportDirectory: $(Build.SourcesDirectory)/coverage
45+
summaryFileLocation: $(Build.SourcesDirectory)/**/*coverage.xml
4746
failIfCoverageEmpty: true
4847
condition: always()
4948
continueOnError: true
50-
env:
51-
disable.coverage.autogenerate: 'true'
5249

53-
- task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0
54-
displayName: ‘Component Detection’
50+

.pipelines/include-runtests-linux.yml

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,6 @@ parameters:
77
- name: SQLPASSWORD
88
type: string
99
default: ''
10-
- name: AZURECLIENTSECRET
11-
type: string
12-
default: ''
1310
- name: SQLCMDSERVER
1411
type: string
1512
default: .
@@ -28,11 +25,11 @@ steps:
2825
SQLPASSWORD: ${{ parameters.SQLPASSWORD }}
2926
SQLCMDUSER: ${{ parameters.SQLCMDUSER }}
3027
SQLCMDPASSWORD: ${{ parameters.SQLPASSWORD }}
31-
AZURE_TENANT_ID: $(AZURE_TENANT_ID)
32-
AZURE_CLIENT_ID: $(AZURE_CLIENT_ID)
33-
AZURE_CLIENT_SECRET: ${{ parameters.AZURECLIENTSECRET }}
3428
SQLCMDSERVER: ${{ parameters.SQLCMDSERVER }}
3529
SQLCMDDBNAME: ${{ parameters.SQLCMDDBNAME }}
30+
AZURESUBSCRIPTION_CLIENT_ID: $(AZURESUBSCRIPTION_CLIENT_ID)
31+
AZURESUBSCRIPTION_TENANT_ID: $(AZURESUBSCRIPTION_TENANT_ID)
32+
SYSTEM_ACCESSTOKEN: $(System.AccessToken)
3633
continueOnError: true
3734
3835
- task: PublishTestResults@2

0 commit comments

Comments
 (0)