Skip to content

Commit 93e6215

Browse files
authored
Make signing pattern inclusive of all sqlcmd*.exe binaries (#273)
1 parent ec71939 commit 93e6215

File tree

2 files changed

+17
-7
lines changed

2 files changed

+17
-7
lines changed

build/azure-pipelines/build-common.yml

+4-2
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ parameters:
1212
default: $(Build.BuildNumber)
1313
- name: BinaryName
1414
type: string
15+
- name: BinaryExt
16+
type: string
1517

1618
steps:
1719
- task: GoTool@0
@@ -50,7 +52,7 @@ steps:
5052
displayName: 'Go: build sqlcmd'
5153
inputs:
5254
command: 'build'
53-
arguments: '-o $(Build.BinariesDirectory)/${{ parameters.BinaryName }} -ldflags="-s -w -X main.version=${{ parameters.VersionTag }}"'
55+
arguments: '-o $(Build.BinariesDirectory)/${{ parameters.BinaryName }}${{ parameters.BinaryExt }} -ldflags="-s -w -X main.version=${{ parameters.VersionTag }}"'
5456
workingDirectory: '$(Build.SourcesDirectory)/cmd/modern'
5557
env:
5658
GOOS: ${{ parameters.OS }}
@@ -62,7 +64,7 @@ steps:
6264
displayName: 'Go: build sqlcmd with debug symbols'
6365
inputs:
6466
command: 'build'
65-
arguments: '-o $(Build.BinariesDirectory)/${{ parameters.BinaryName }}_debug -ldflags="-X main.version=${{ parameters.VersionTag }}"'
67+
arguments: '-o $(Build.BinariesDirectory)/${{ parameters.BinaryName }}_debug${{ parameters.BinaryExt }} -ldflags="-X main.version=${{ parameters.VersionTag }}"'
6668
workingDirectory: '$(Build.SourcesDirectory)/cmd/modern'
6769
env:
6870
GOOS: ${{ parameters.OS }}

build/azure-pipelines/build-product.yml

+13-5
Original file line numberDiff line numberDiff line change
@@ -24,48 +24,56 @@ stages:
2424
os:
2525
arch:
2626
binaryName: 'sqlcmd'
27+
binaryExt: ''
2728
mac:
2829
imageName: 'macOS-latest'
2930
artifact: DarwinAmd64
3031
os:
3132
arch:
3233
binaryName: 'sqlcmd'
34+
binaryExt: ''
3335
macArm:
3436
imageName: 'macOS-latest'
3537
artifact: DarwinArm64
3638
os:
3739
arch: arm64
3840
binaryName: 'sqlcmd'
41+
binaryExt: ''
3942
windows:
4043
imageName: 'windows-latest'
4144
artifact: WindowsAmd64
4245
os:
4346
arch:
44-
binaryName: 'sqlcmd.exe'
47+
binaryName: 'sqlcmd'
48+
binaryExt: '.exe'
4549
linuxArm:
4650
imageName: 'ubuntu-latest'
4751
artifact: LinuxArm64
4852
os:
4953
arch: arm64
5054
binaryName: 'sqlcmd'
55+
binaryExt: ''
5156
windowsArm:
5257
imageName: 'windows-latest'
5358
artifact: WindowsArm
5459
os:
5560
arch: arm
56-
binaryName: 'sqlcmd.exe'
61+
binaryName: 'sqlcmd'
62+
binaryExt: '.exe'
5763
windowsArm64:
5864
imageName: 'windows-latest'
5965
artifact: WindowsArm64
6066
os:
6167
arch: arm64
62-
binaryName: 'sqlcmd.exe'
68+
binaryName: 'sqlcmd'
69+
binaryExt: '.exe'
6370
linuxs390x:
6471
imageName: 'ubuntu-latest'
6572
artifact: LinuxS390x
6673
os:
6774
arch: s390x
6875
binaryName: 'sqlcmd'
76+
binaryExt: '.exe'
6977
pool:
7078
vmImage: $(imageName)
7179
steps:
@@ -79,7 +87,7 @@ stages:
7987
ArtifactName: $(artifact)
8088
VersionTag: $(getVersion.VERSION_TAG)
8189
BinaryName: $(binaryName)
82-
90+
BinaryExt: $(binaryExt)
8391
- stage: CreatePackages
8492
displayName: Create packages to publish
8593
jobs:
@@ -97,7 +105,7 @@ stages:
97105
inputs:
98106
ConnectedServiceName: 'Code Signing'
99107
FolderPath: '$(Pipeline.Workspace)'
100-
Pattern: 'sqlcmd.exe'
108+
Pattern: 'sqlcmd*.exe'
101109
signConfigType: 'inlineSignParams'
102110
inlineOperation: |
103111
[

0 commit comments

Comments
 (0)