simplify back make

viamrobotics · Jan 15, 2025 · a6cb616 · a6cb616
1 parent b276777
commit a6cb616
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/.github/workflows/build-msi.yaml b/.github/workflows/build-msi.yaml
@@ -55,7 +55,7 @@ jobs:
           wix build agent.wxs -define GoBinDir="${{ github.workspace }}\bin" -define MSIProductVersion="${{ github.event.inputs.msi_version }}" -ext WixToolset.Util.wixext -ext WixToolset.Firewall.wixext -o agent-${{ github.event.inputs.msi_version }}.msi
     
       - name: Upload MSI artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: agent-${{ github.event.inputs.msi_version }}.msi
           path: agent-${{ github.event.inputs.msi_version }}.msi
diff --git a/Makefile b/Makefile
@@ -40,10 +40,8 @@ bin/viam-agent-$(PATH_VERSION)-$(LINUX_ARCH): go.* *.go */*.go */*/*.go subsyste
 .PHONY: windows
 windows: bin/viam-agent.exe
 
-bin/viam-agent.exe: export GOOS=windows
-bin/viam-agent.exe: export GOARCH=amd64
 bin/viam-agent.exe:
-	go build -o $@ -trimpath -tags $(TAGS) -ldflags $(LDFLAGS) ./cmd/viam-agent
+	GOOS=windows GOARCH=amd64 go build -o $@ -trimpath -tags $(TAGS) -ldflags $(LDFLAGS) ./cmd/viam-agent
 
 .PHONY: clean
 clean: