From a6cb6168ed554e27528773fa8fd2aa5c79058ca1 Mon Sep 17 00:00:00 2001 From: Ale Paredes <1709578+ale7714@users.noreply.github.com> Date: Wed, 15 Jan 2025 17:09:41 -0500 Subject: [PATCH] simplify back make --- .github/workflows/build-msi.yaml | 2 +- Makefile | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-msi.yaml b/.github/workflows/build-msi.yaml index cba488f..d50dc2f 100644 --- 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 index 3ef0124..7501008 100644 --- 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: