remove msi installer #265

Author: sechmann

.github/workflows/frontends.yml

@@ -37,7 +37,7 @@ jobs:
         id: set-version
         run: echo "version=${GITHUB_REF#refs/*/}" >> ${GITHUB_OUTPUT}
 
-  build-windows-bin:
+  build-windows:
     needs:
       - set-version
     runs-on: ubuntu-22.04
@@ -75,45 +75,11 @@ jobs:
           path: bin/windows-client
           if-no-files-found: error
 
-      - name: upload new windows-installer
-        uses: actions/upload-artifact@v2
-        with:
-          name: new-windows-installer${{ matrix.output-suffix }}
-          path: packaging/windows/naisdevice.exe
-          if-no-files-found: error
-
-  build-windows:
-    strategy:
-      matrix:
-        output-suffix: ["", "-tenant"]
-    needs:
-      - build-windows-bin
-    runs-on: windows-latest
-    steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-go@v2
-        with:
-          go-version: ${{ env.go_version }}
-      - name: Add msbuild to PATH
-        uses: microsoft/setup-msbuild@v1
-      - name: download windows binaries
-        uses: actions/download-artifact@v3
-        with:
-          name: windows-client${{ matrix.output-suffix }}
-          path: bin/windows
-      - name: set version env var
-        run: |
-          $version = 800+[int]$Env:GITHUB_RUN_NUMBER
-          "WINDOWS_BUILD_NUMBER=$version" >> $Env:GITHUB_ENV
-      - name: create windows installer
-        run: |
-          msbuild packaging\windows\naisdevice.wixproj
-          md5sum bin/windows/naisdevice.msi
-      - name: upload windows installer
+      - name: upload windows-installer
         uses: actions/upload-artifact@v2
         with:
           name: windows-installer${{ matrix.output-suffix }}
-          path: bin/windows/naisdevice.msi
+          path: packaging/windows/naisdevice.exe
           if-no-files-found: error
 
   build-macos:
@@ -228,18 +194,6 @@ jobs:
         uses: actions/download-artifact@v3
         with:
           name: windows-installer${{ matrix.output-suffix }}
-      - name: upload naisdevice.msi
-        uses: actions/upload-release-asset@v1
-        with:
-          upload_url: ${{ needs.new_release.outputs.upload_url }}
-          asset_path: ./naisdevice.msi
-          asset_name: naisdevice${{ matrix.output-suffix }}.msi
-          asset_content_type: application/octet-stream
-
-      - name: download new windows installer
-        uses: actions/download-artifact@v3
-        with:
-          name: new-windows-installer${{ matrix.output-suffix }}
       - name: Calculate checksum
         run: |
           sha256sum naisdevice.exe | awk {'print $1}' > naisdevice.exe.sha256

Makefile

@@ -53,9 +53,9 @@ macos-client:
 # Run by GitHub actions on linux
 windows-client:
 	mkdir -p ./bin/windows-client
-	go install github.com/akavel/rsrc@latest
-	${GOPATH}/bin/rsrc -arch amd64 -manifest ./packaging/windows/admin_manifest.xml -ico assets/nais-logo-blue.ico -o ./cmd/helper/main_windows.syso
-	${GOPATH}/bin/rsrc -ico assets/nais-logo-blue.ico -o ./cmd/device-agent/main_windows.syso
+	
+	go run github.com/akavel/rsrc -arch amd64 -manifest ./packaging/windows/admin_manifest.xml -ico assets/nais-logo-blue.ico -o ./cmd/helper/main_windows.syso
+	go run github.com/akavel/rsrc -ico assets/nais-logo-blue.ico -o ./cmd/device-agent/main_windows.syso
 	GOOS=windows GOARCH=amd64 go build -o bin/windows-client/naisdevice-systray.exe --tags "$(GOTAGS)" -ldflags "-s $(LDFLAGS) -H=windowsgui" ./cmd/systray
 	./packaging/windows/sign-exe bin/windows-client/naisdevice-systray.exe ./packaging/windows/naisdevice.crt ./packaging/windows/naisdevice.key
 	GOOS=windows GOARCH=amd64 go build -o bin/windows-client/naisdevice-agent.exe --tags "$(GOTAGS)" -ldflags "-s $(LDFLAGS) -H=windowsgui" ./cmd/device-agent

go.mod

@@ -105,6 +105,7 @@ require (
 require (
 	cloud.google.com/go/compute/metadata v0.2.3 // indirect
 	github.com/BurntSushi/toml v1.2.1 // indirect
+	github.com/akavel/rsrc v0.10.2 // indirect
 	github.com/chigopher/pathlib v0.15.0 // indirect
 	github.com/fsnotify/fsnotify v1.6.0 // indirect
 	github.com/go-logr/logr v1.2.3 // indirect

go.sum

@@ -621,6 +621,8 @@ github.com/ajstarks/deck v0.0.0-20200831202436-30c9fc6549a9/go.mod h1:JynElWSGnm
 github.com/ajstarks/deck/generate v0.0.0-20210309230005-c3f852c02e19/go.mod h1:T13YZdzov6OU0A1+RfKZiZN9ca6VeKdBdyDV+BY97Tk=
 github.com/ajstarks/svgo v0.0.0-20180226025133-644b8db467af/go.mod h1:K08gAheRH3/J6wwsYMMT4xOr94bZjxIelGM0+d/wbFw=
 github.com/ajstarks/svgo v0.0.0-20211024235047-1546f124cd8b/go.mod h1:1KcenG0jGWcpt8ov532z81sp/kMMUG485J2InIOyADM=
+github.com/akavel/rsrc v0.10.2 h1:Zxm8V5eI1hW4gGaYsJQUhxpjkENuG91ki8B4zCrvEsw=
+github.com/akavel/rsrc v0.10.2/go.mod h1:uLoCtb9J+EyAqh+26kdrTgmzRBFPGOolLWKpdxkKq+c=
 github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
 github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
 github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=

packaging/windows/naisdevice.wixproj

@@ -4,6 +4,7 @@
 package tools
 
 import (
+	_ "github.com/akavel/rsrc"
 	_ "github.com/vektra/mockery/v2"
 	_ "golang.org/x/vuln/cmd/govulncheck"
 	_ "google.golang.org/grpc/cmd/protoc-gen-go-grpc"