Skip to content

Commit 2a0ff65

Browse files
Merge branch 'main' into main
2 parents 0f02164 + 7155706 commit 2a0ff65

7 files changed

Lines changed: 89 additions & 104 deletions

File tree

.github/workflows/golangci-lint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
# Verify: gh api repos/actions/setup-go/git/ref/tags/v6 --jq '.object.sha'
1414
- uses: actions/setup-go@7a3fe6cf4cb3a834922a1244abfce67bcef6a0c5 # v6.2.0
1515
with:
16-
go-version: '1.24'
16+
go-version: '1.25'
1717
- uses: actions/checkout@v6
1818
- name: golangci-lint
1919
# Pinned to commit SHA for supply chain security (CWE-829)

.github/workflows/pr-validation.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
- name: Setup go
1414
uses: actions/setup-go@v6
1515
with:
16-
go-version: '1.24'
16+
go-version: '1.25'
1717
- name: Run tests against Linux SQL
1818
run: |
1919
go version

.github/workflows/security.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
- name: Setup Go
3030
uses: actions/setup-go@v6
3131
with:
32-
go-version: '1.24.13'
32+
go-version-file: go.mod
3333

3434
- name: Install govulncheck
3535
run: go install golang.org/x/vuln/cmd/govulncheck@latest
Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
steps:
22
- task: GoTool@0
33
inputs:
4-
version: '1.24.2'
4+
version: '1.25.7'
55
- task: Go@0
66
displayName: 'Go: get dependencies'
77
inputs:
@@ -18,18 +18,10 @@ steps:
1818
workingDirectory: '$(System.DefaultWorkingDirectory)'
1919

2020
- task: Go@0
21-
displayName: 'Go: install github.com/axw/gocov/gocov'
21+
displayName: 'Go: install github.com/boumenot/gocover-cobertura'
2222
inputs:
2323
command: 'custom'
2424
customCommand: 'install'
25-
arguments: 'github.com/axw/gocov/gocov@latest'
26-
workingDirectory: '$(System.DefaultWorkingDirectory)'
27-
28-
- task: Go@0
29-
displayName: 'Go: install github.com/axw/gocov/gocov'
30-
inputs:
31-
command: 'custom'
32-
customCommand: 'install'
33-
arguments: 'github.com/AlekSi/gocov-xml@latest'
25+
arguments: 'github.com/boumenot/gocover-cobertura@latest'
3426
workingDirectory: '$(System.DefaultWorkingDirectory)'
3527

.pipelines/include-runtests-linux.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,7 @@ parameters:
1616
steps:
1717
- script: |
1818
~/go/bin/gotestsum --junitfile "${{ parameters.RunName }}.testresults.xml" -- ./... -coverprofile="${{ parameters.RunName }}.coverage.txt" -covermode count
19-
~/go/bin/gocov convert "${{ parameters.RunName }}.coverage.txt" > "${{ parameters.RunName }}.coverage.json"
20-
~/go/bin/gocov-xml < "${{ parameters.RunName }}.coverage.json" > ${{ parameters.RunName }}.coverage.xml
19+
~/go/bin/gocover-cobertura < "${{ parameters.RunName }}.coverage.txt" > ${{ parameters.RunName }}.coverage.xml
2120
mkdir -p coverage
2221
workingDirectory: '$(Build.SourcesDirectory)'
2322
displayName: 'run tests'

go.mod

Lines changed: 26 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
module github.com/microsoft/go-sqlcmd
22

3-
go 1.24.0
4-
5-
toolchain go1.24.12
3+
go 1.25.8
64

75
require (
86
github.com/alecthomas/chroma/v2 v2.23.1
@@ -13,28 +11,28 @@ require (
1311
github.com/docker/go-connections v0.6.0
1412
github.com/golang-sql/sqlexp v0.1.0
1513
github.com/google/uuid v1.6.0
16-
github.com/microsoft/go-mssqldb v1.9.6
14+
github.com/microsoft/go-mssqldb v1.9.8
1715
github.com/opencontainers/image-spec v1.1.1
1816
github.com/peterh/liner v1.2.2
1917
github.com/pkg/errors v0.9.1
2018
github.com/spf13/cobra v1.10.2
2119
github.com/spf13/pflag v1.0.10
2220
github.com/spf13/viper v1.21.0
2321
github.com/stretchr/testify v1.11.1
24-
golang.org/x/sys v0.41.0
25-
golang.org/x/term v0.40.0
26-
golang.org/x/text v0.34.0
27-
golang.org/x/tools v0.42.0
22+
golang.org/x/sys v0.42.0
23+
golang.org/x/term v0.41.0
24+
golang.org/x/text v0.35.0
25+
golang.org/x/tools v0.43.0
2826
gopkg.in/yaml.v2 v2.4.0
2927
)
3028

3129
require (
32-
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.18.0 // indirect
33-
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.10.1 // indirect
34-
github.com/Azure/azure-sdk-for-go/sdk/internal v1.11.1 // indirect
35-
github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/azkeys v1.3.1 // indirect
36-
github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/internal v1.1.1 // indirect
37-
github.com/AzureAD/microsoft-authentication-library-for-go v1.4.2 // indirect
30+
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.21.0 // indirect
31+
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.13.1 // indirect
32+
github.com/Azure/azure-sdk-for-go/sdk/internal v1.11.2 // indirect
33+
github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/azkeys v1.4.0 // indirect
34+
github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/internal v1.2.0 // indirect
35+
github.com/AzureAD/microsoft-authentication-library-for-go v1.6.0 // indirect
3836
github.com/Microsoft/go-winio v0.6.2 // indirect
3937
github.com/beorn7/perks v1.0.1 // indirect
4038
github.com/cespare/xxhash/v2 v2.3.0 // indirect
@@ -48,10 +46,10 @@ require (
4846
github.com/docker/libtrust v0.0.0-20160708172513-aabc10ec26b7 // indirect
4947
github.com/felixge/httpsnoop v1.0.4 // indirect
5048
github.com/fsnotify/fsnotify v1.9.0 // indirect
51-
github.com/go-logr/logr v1.4.2 // indirect
49+
github.com/go-logr/logr v1.4.3 // indirect
5250
github.com/go-logr/stdr v1.2.2 // indirect
5351
github.com/go-viper/mapstructure/v2 v2.4.0 // indirect
54-
github.com/golang-jwt/jwt/v5 v5.2.2 // indirect
52+
github.com/golang-jwt/jwt/v5 v5.3.1 // indirect
5553
github.com/golang-sql/civil v0.0.0-20220223132316-b832511892a9 // indirect
5654
github.com/golang/protobuf v1.5.4 // indirect
5755
github.com/gorilla/mux v1.8.1 // indirect
@@ -77,22 +75,22 @@ require (
7775
github.com/spf13/afero v1.15.0 // indirect
7876
github.com/spf13/cast v1.10.0 // indirect
7977
github.com/subosito/gotenv v1.6.0 // indirect
80-
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
78+
go.opentelemetry.io/auto/sdk v1.2.1 // indirect
8179
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.60.0 // indirect
82-
go.opentelemetry.io/otel v1.35.0 // indirect
80+
go.opentelemetry.io/otel v1.40.0 // indirect
8381
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.35.0 // indirect
84-
go.opentelemetry.io/otel/metric v1.35.0 // indirect
85-
go.opentelemetry.io/otel/trace v1.35.0 // indirect
82+
go.opentelemetry.io/otel/metric v1.40.0 // indirect
83+
go.opentelemetry.io/otel/sdk v1.40.0 // indirect
84+
go.opentelemetry.io/otel/sdk/metric v1.40.0 // indirect
85+
go.opentelemetry.io/otel/trace v1.40.0 // indirect
8686
go.yaml.in/yaml/v3 v3.0.4 // indirect
87-
golang.org/x/crypto v0.48.0 // indirect
88-
golang.org/x/mod v0.33.0 // indirect
89-
golang.org/x/net v0.50.0 // indirect
90-
golang.org/x/sync v0.19.0 // indirect
87+
golang.org/x/crypto v0.49.0 // indirect
88+
golang.org/x/mod v0.34.0 // indirect
89+
golang.org/x/net v0.52.0 // indirect
90+
golang.org/x/sync v0.20.0 // indirect
9191
golang.org/x/time v0.14.0 // indirect
92-
google.golang.org/genproto/googleapis/api v0.0.0-20250425173222-7b384671a197 // indirect
93-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250425173222-7b384671a197 // indirect
94-
google.golang.org/grpc v1.71.1 // indirect
95-
google.golang.org/protobuf v1.36.6 // indirect
92+
google.golang.org/grpc v1.79.3 // indirect
93+
google.golang.org/protobuf v1.36.10 // indirect
9694
gopkg.in/yaml.v3 v3.0.1 // indirect
9795
gotest.tools/v3 v3.5.2 // indirect
9896
)

0 commit comments

Comments
 (0)