Fix ARM64 builds (#234)

* Fix ARM64 builds

* add windows arm

* include NOTICE in the zips

Author: shueybubbles

.gitignore

@@ -27,3 +27,8 @@ testresults.xml
 # IDE files
 .idea
 
+darwin-amd64/sqlcmd
+darwin-arm64/sqlcmd
+linux-amd64/sqlcmd
+linux-arm64/sqlcmd
+linux-s390x/sqlcmd

build/arch.txt

@@ -0,0 +1,8 @@
+darwin,amd64,sqlcmd
+darwin,arm64,sqlcmd
+linux,amd64,sqlcmd
+linux,arm64,sqlcmd
+linux,s390x,sqlcmd
+windows,arm64,sqlcmd.exe
+windows,amd64,sqlcmd.exe
+windows,arm,sqlcmd.exe

build/azure-pipelines/build-product.yml

@@ -30,6 +30,12 @@ stages:
             os:
             arch:
             binaryName: 'sqlcmd'
+          macArm:
+            imageName: 'macOS-latest'
+            artifact: DarwinArm64
+            os:
+            arch: arm64
+            binaryName: 'sqlcmd'
           windows:
             imageName: 'windows-latest'
             artifact: WindowsAmd64
@@ -42,14 +48,18 @@ stages:
             os:
             arch: arm64
             binaryName: 'sqlcmd'
-          # BUG: https://github.com/microsoft/go-sqlcmd/issues/224
-          # Windows ARM build failing in named pipes code
-          #windowsArm:
-          #  imageName: 'windows-latest'
-          #  artifact: WindowsArm
-          #  os:
-          #  arch: arm
-          #  binaryName: 'sqlcmd.exe'
+          windowsArm:
+           imageName: 'windows-latest'
+           artifact: WindowsArm
+           os:
+           arch: arm
+           binaryName: 'sqlcmd.exe'
+          windowsArm64:
+            imageName: 'windows-latest'
+            artifact: WindowsArm64
+            os:
+            arch: arm64
+            binaryName: 'sqlcmd.exe' 
           linuxs390x:
             imageName: 'ubuntu-latest'
             artifact: LinuxS390x
@@ -138,18 +148,26 @@ stages:
       - task: ArchiveFiles@2
         displayName: Zip Windows amd64 binary
         inputs:
-          rootFolderOrFile: '$(Pipeline.Workspace)\SqlcmdWindowsAmd64\Sqlcmd.exe'
+          rootFolderOrFile: '$(Pipeline.Workspace)\SqlcmdWindowsAmd64'
           includeRootFolder: false
           archiveType: 'zip'
           archiveFile: '$(Build.ArtifactStagingDirectory)/sqlcmd-$(getVersion.VERSION_TAG)-windows-x64.zip'
 
-      #- task: ArchiveFiles@2
-      #  displayName: Zip Windows arm binary
-      #  inputs:
-      #    rootFolderOrFile: '$(Pipeline.Workspace)\SqlcmdWindowsArm\Sqlcmd.exe'
-      #    includeRootFolder: false
-      #    archiveType: 'zip'
-      #    archiveFile: '$(Build.ArtifactStagingDirectory)/sqlcmd-$(getVersion.VERSION_TAG)-windows-arm.zip'
+      - task: ArchiveFiles@2
+        displayName: Zip Windows arm binary
+        inputs:
+          rootFolderOrFile: '$(Pipeline.Workspace)\SqlcmdWindowsArm'
+          includeRootFolder: false
+          archiveType: 'zip'
+          archiveFile: '$(Build.ArtifactStagingDirectory)/sqlcmd-$(getVersion.VERSION_TAG)-windows-arm.zip'
+
+      - task: ArchiveFiles@2
+        displayName: Zip Windows arm64 binary
+        inputs:
+          rootFolderOrFile: '$(Pipeline.Workspace)\SqlcmdWindowsArm64'
+          includeRootFolder: false
+          archiveType: 'zip'
+          archiveFile: '$(Build.ArtifactStagingDirectory)/sqlcmd-$(getVersion.VERSION_TAG)-windows-arm64.zip'
 
       - task: ArchiveFiles@2
         displayName: Tar Linux amd64 binary
@@ -169,6 +187,15 @@ stages:
           tarCompression: 'bz2'
           archiveFile: '$(Build.ArtifactStagingDirectory)/sqlcmd-$(getVersion.VERSION_TAG)-darwin-x64.tar.bz2'
 
+      - task: ArchiveFiles@2
+        displayName: Tar Darwin Arm binary
+        inputs:
+          rootFolderOrFile: '$(Pipeline.Workspace)\SqlcmdDarwinArm64'
+          includeRootFolder: false
+          archiveType: 'tar'
+          tarCompression: 'bz2'
+          archiveFile: '$(Build.ArtifactStagingDirectory)/sqlcmd-$(getVersion.VERSION_TAG)-darwin-arm64.tar.bz2'
+
       - task: ArchiveFiles@2
         displayName: Tar Linux arm64 binary
         inputs:

build/build.cmd

@@ -13,4 +13,9 @@ go-licenses report github.com/microsoft/go-sqlcmd/cmd/modern --template build\NO
 copy %~dp0NOTICE.header + %~dp0notice.txt %~dp0..\NOTICE.md
 del %~dp0notice.txt
 
+REM Generates all versions of sqlcmd in platform-specific folder
+setlocal
+
+for /F "tokens=1-3 delims=," %%i in (%~dp0arch.txt) do set GOOS=%%i&set GOARCH=%%j&go build -o %~dp0..\%%i-%%j\%%k -ldflags="-X main.version=%sqlcmdVersion%" %~dp0..\cmd\modern
+
 

pkg/sqlcmd/sqlcmd.go

@@ -21,8 +21,6 @@ import (
 	"github.com/golang-sql/sqlexp"
 	mssql "github.com/microsoft/go-mssqldb"
 	"github.com/microsoft/go-mssqldb/msdsn"
-	_ "github.com/microsoft/go-mssqldb/namedpipe"
-	_ "github.com/microsoft/go-mssqldb/sharedmemory"
 	"golang.org/x/text/encoding/unicode"
 	"golang.org/x/text/transform"
 )
@@ -539,13 +537,3 @@ func (s Sqlcmd) Log(_ context.Context, _ msdsn.Log, msg string) {
 	_, _ = s.GetOutput().Write([]byte("DRIVER:" + msg))
 	_, _ = s.GetOutput().Write([]byte(SqlcmdEol))
 }
-
-func init() {
-	if len(msdsn.ProtocolParsers) == 3 {
-		// reorder the protocol parsers to lpc->np->tcp
-		// ODBC follows this same order.
-		var tcp = msdsn.ProtocolParsers[0]
-		msdsn.ProtocolParsers[0] = msdsn.ProtocolParsers[2]
-		msdsn.ProtocolParsers[2] = tcp
-	}
-}

pkg/sqlcmd/sqlcmd_windows_amd64.go

@@ -0,0 +1,17 @@
+package sqlcmd
+
+import (
+	"github.com/microsoft/go-mssqldb/msdsn"
+	_ "github.com/microsoft/go-mssqldb/namedpipe"
+	_ "github.com/microsoft/go-mssqldb/sharedmemory"
+)
+
+func init() {
+	if len(msdsn.ProtocolParsers) == 3 {
+		// reorder the protocol parsers to lpc->np->tcp
+		// ODBC follows this same order.
+		var tcp = msdsn.ProtocolParsers[0]
+		msdsn.ProtocolParsers[0] = msdsn.ProtocolParsers[2]
+		msdsn.ProtocolParsers[2] = tcp
+	}
+}