Delete GOARCH=386 from windows build

deansheather · deansheather · commit 3746bf5269c7 · 2021-07-24T07:21:00.000Z
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -22,8 +22,8 @@ jobs:
       - name: Upload windows
         uses: actions/upload-artifact@v2
         with:
-          name: coder-cli-windows-386
-          path: ./ci/bin/coder-cli-windows-386.zip
+          name: coder-cli-windows
+          path: ./ci/bin/coder-cli-windows.zip
   build_darwin:
     name: Build darwin binary
     runs-on: macos-latest
@@ -74,7 +74,7 @@ jobs:
           draft: true
           prerelease: false
       - name: Upload Linux Release
-        id: upload-linux-release-asset 
+        id: upload-linux-release-asset
         uses: actions/upload-release-asset@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -84,7 +84,7 @@ jobs:
           asset_name: coder-cli-linux-amd64.tar.gz
           asset_content_type: application/tar+gzip
       - name: Upload MacOS Release
-        id: upload-macos-release-asset 
+        id: upload-macos-release-asset
         uses: actions/upload-release-asset@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -94,12 +94,12 @@ jobs:
           asset_name: coder-cli-darwin-amd64.zip
           asset_content_type: application/zip
       - name: Upload Windows Release
-        id: upload-windows-release-asset 
+        id: upload-windows-release-asset
         uses: actions/upload-release-asset@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: coder-cli-windows-386/coder-cli-windows-386.zip
-          asset_name: coder-cli-windows-386.zip
+          asset_path: coder-cli-windows/coder-cli-windows.zip
+          asset_name: coder-cli-windows.zip
           asset_content_type: application/zip
diff --git a/Makefile b/Makefile
@@ -1,4 +1,4 @@
-# Makefile for Coder CLI 
+# Makefile for Coder CLI
 
 .PHONY: clean build build/macos build/windows build/linux fmt lint gendocs test/go dev
 
@@ -14,7 +14,7 @@ build/macos:
 	# requires darwin
 	CGO_ENABLED=1 GOOS=darwin GOARCH=amd64 ./ci/scripts/build.sh
 build/windows:
-	CGO_ENABLED=0 GOOS=windows GOARCH=386 ./ci/scripts/build.sh
+	CGO_ENABLED=0 GOOS=windows ./ci/scripts/build.sh
 build/linux:
 	CGO_ENABLED=0 GOOS=linux GOARCH=amd64 ./ci/scripts/build.sh
 
diff --git a/ci/scripts/build.sh b/ci/scripts/build.sh
@@ -8,19 +8,25 @@ set -euo pipefail
 
 cd "$(git rev-parse --show-toplevel)/ci/scripts"
 
-tag=$(git describe --tags)
+tag="$(git describe --tags)"
 
-echo "--- building coder-cli for $GOOS-$GOARCH"
+flavor="$GOOS"
+if [[ "$GOOS" == "windows" ]]; then
+	unset GOARCH
+else
+	flavor+="-$GOARCH"
+fi
+echo "--- building coder-cli for $flavor"
 
-tmpdir=$(mktemp -d)
+tmpdir="$(mktemp -d)"
 go build -ldflags "-X cdr.dev/coder-cli/internal/version.Version=${tag}" -o "$tmpdir/coder" ../../cmd/coder
 
 cp ../gon.json $tmpdir/gon.json
 
 pushd "$tmpdir"
 case "$GOOS" in
 "windows")
-	artifact="coder-cli-$GOOS-$GOARCH.zip"
+	artifact="coder-cli-$GOOS.zip"
 	mv coder coder.exe
 	zip "$artifact" coder.exe
 	;;
diff --git a/internal/cmd/configssh.go b/internal/cmd/configssh.go
@@ -161,6 +161,7 @@ func binPath() (string, error) {
 	// if it isn't.
 	if runtime.GOOS == "windows" {
 		binName := filepath.Base(exePath)
+
 		// We use safeexec instead of os/exec because os/exec returns paths in
 		// the current working directory, which we will run into very often when
 		// looking for our own path.
