Merge pull request #1 from thinnect/gomod-actions

Gomod actions CORE-157 CORE-158 TS-541

Author: raidoz

.github/workflows/deviceparameters.yml

@@ -0,0 +1,51 @@
+name: build-deviceparameters
+on: [push]
+jobs:
+  build:
+    runs-on: ubuntu-20.04
+    steps:
+    - uses: actions/checkout@v2
+
+    - name: Setup Go
+      uses: actions/setup-go@v2
+      with:
+        go-version: '1.17.2'
+
+    - name: Install build tools
+      run: sudo apt update && sudo apt install -y lsb-release build-essential debhelper upx ruby ruby-dev
+
+    - name: Install ronn for converting manpages
+      run: sudo gem install ronn
+
+    # AMD64
+    - name: Build for amd64
+      run: cd support && make amd64
+
+    - name: Install amd64
+      run: sudo dpkg -i mist-device-parameters_*_amd64.deb
+
+    - name: Run installed deviceparamter
+      run: deviceparameter -V
+
+    - name: Run installed deviceparamters
+      run: deviceparameters -V
+
+    # ARMv5 / armel
+    - name: Build for armel(arm5)
+      run: cd support && make armel
+
+    # ARMv6 / armhf
+    - name: Build for armhf(arm6)
+      run: cd support && make armhf
+
+    # Windows
+    - name: Build for Windows
+      run: cd support && make win64
+
+    # Publish
+    - uses: ncipollo/release-action@v1
+      if: startsWith(github.ref, 'refs/tags/')
+      with:
+        artifacts: "mist-device-parameters_*.deb,mist-device-parameters_*.zip"
+        token: ${{ secrets.GITHUB_TOKEN }}
+        draft: true

.gitignore

@@ -1 +1,4 @@
-vendor
+*.deb
+*.zip
+*.buildinfo
+*.changes

.gitmodules

@@ -11,20 +11,14 @@ See the [deviceparameter README](cmd/deviceparameter/README.md) for details.
 A utility for dealing with several parameters on multiple nodes.
 See the [deviceparameters README](cmd/deviceparameters/README.md) for details.
 
-# Dependencies
-Go dependencies have been vendored as submodules under the vendor directory.
-
-Building the _deb_ package requires `checkinstall` and `ronn`.
-
-`ronn` can be obtained from <https://github.com/rtomayko/ronn>.
-
 # Building
 
-Check out all submodules, install `ronn` and `checkinstall`.
+Enter `cmd/deviceparameter` or `cmd/deviceparameters` and execute `make` to
+see supported targets. Both applications can be cross-compiled for Windows and
+for use on ARM based Linux platforms.
 
-Enter `cmd/deviceparameter` or `cmd/deviceparameters` and execute `make` or
-enter `cmd` and execute the `build-deb.sh` script.
+Packaged versions can be built from the support directory, see the
+[support/Makefile](support/Makefile) for available options.
 
-Both applications can be cross-compiled for Windows and for use on ARM based
-Linux platforms, though packaging only works on the native architecture. Take a
-look at the Makefiles for details.
+Building the deb packages requires `ronn`, which can be installed with ruby's
+`gem` or can be obtained from <https://github.com/rtomayko/ronn>.

README.md

@@ -0,0 +1 @@
+build

cmd/Makefile

@@ -3,45 +3,93 @@
 BUILD_DATE = $(shell date -u '+%Y-%m-%d_%H:%M:%S')
 BUILD_DISTRO = $(shell lsb_release -sd)
 
-all: deviceparameter manual
+USE_UPX ?= 0
+ifneq ($(USE_UPX),0)
+	BUILD_PARTS := build compress-brute
+else
+	BUILD_PARTS := build
+endif
 
-win32: export GOOS=windows
-win32: export GOARCH=386
-win32: deviceparameter.exe
+# In this setup arm5=armel and arm6=armhf for widest compatibility
+GOALS := amd64 arm5 armel arm6 armhf arm7 arm64 win64 clean
+ifeq (,$(filter $(GOALS),$(MAKECMDGOALS)))
+  $(error Build with make amd64/arm5/armel/arm6/armhf/arm7/arm64/win64)
+endif
+
+amd64:
+amd64: export GOOS=linux
+amd64: export GOARCH=amd64
+amd64: export FLAVOUR=$(GOOS)-$(GOARCH)
+amd64: $(BUILD_PARTS) manual
+
+arm5: export GOOS=linux
+arm5: export GOARCH=arm
+arm5: export GOARM=5
+arm5: export FLAVOUR=$(GOOS)-$(GOARCH)$(GOARM)
+arm5: $(BUILD_PARTS) manual
+
+armel: export GOOS=linux
+armel: export GOARCH=arm
+armel: export GOARM=5
+armel: export FLAVOUR=$(GOOS)-armel
+armel: $(BUILD_PARTS) manual
+
+arm6: export GOOS=linux
+arm6: export GOARCH=arm
+arm6: export GOARM=6
+arm6: export FLAVOUR=$(GOOS)-$(GOARCH)$(GOARM)
+arm6: $(BUILD_PARTS) manual
+
+armhf: export GOOS=linux
+armhf: export GOARCH=arm
+armhf: export GOARM=6
+armhf: export FLAVOUR=$(GOOS)-armhf
+armhf: $(BUILD_PARTS) manual
+
+arm7: export GOOS=linux
+arm7: export GOARCH=arm
+arm7: export GOARM=7
+arm7: export FLAVOUR=$(GOOS)-$(GOARCH)$(GOARM)
+arm7: $(BUILD_PARTS) manual
+
+arm64: export GOOS=linux
+arm64: export GOARCH=arm64
+arm64: export FLAVOUR=$(GOOS)-$(GOARCH)
+arm64: $(BUILD_PARTS) manual
 
 win64: export GOOS=windows
 win64: export GOARCH=amd64
+win64: export FLAVOUR=$(GOOS)-$(GOARCH)
 win64: deviceparameter.exe
 
-raspberry: export GOOS=linux
-raspberry: export GOARCH=arm
-raspberry: export GOARM=6
-raspberry: deviceparameter
-
-raspberry2: export GOOS=linux
-raspberry2: export GOARCH=arm
-raspberry2: export GOARM=7
-raspberry2: deviceparameter
+builddir: $(FLAVOUR)
+	mkdir -p build/$(FLAVOUR)
 
-deviceparameter:
-	go build -o deviceparameter -ldflags "-X 'main.ApplicationBuildDate=$(BUILD_DATE)' -X 'main.ApplicationBuildDistro=$(BUILD_DISTRO)'"
+# -s disable symbol table
+# -w disable DWARF generation
+build: builddir
+	go build -o build/$(FLAVOUR)/deviceparameter -ldflags "-w -s -X 'main.ApplicationBuildDate=$(BUILD_DATE)' -X 'main.ApplicationBuildDistro=$(BUILD_DISTRO)'"
 
 deviceparameter.exe:
-	go build -o deviceparameter.exe -ldflags "-X 'main.ApplicationBuildDate=$(BUILD_DATE)' -X 'main.ApplicationBuildDistro=$(BUILD_DISTRO)'"
+	go build -o build/$(FLAVOUR)/deviceparameter.exe -ldflags "-w -s -X 'main.ApplicationBuildDate=$(BUILD_DATE)' -X 'main.ApplicationBuildDistro=$(BUILD_DISTRO)'"
+
+# upx will make the binary much smaller
+compress: build
+	upx build/$(FLAVOUR)/deviceparameter
 
-deviceparameter.1.gz:
+# but will take quite a while with --brute
+compress-brute: build
+	upx --brute build/$(FLAVOUR)/deviceparameter
+
+build/$(FLAVOUR)/deviceparameter.1.gz:
 	ronn --roff README.md
 	mv README.1 deviceparameter.1
 	gzip deviceparameter.1
+	mv deviceparameter.1.gz build/$(FLAVOUR)/
 
-manual: deviceparameter.1.gz
-
-install: deviceparameter manual
-	install -m 0755 deviceparameter /usr/local/bin
-	install -m 0644 deviceparameter /usr/local/man/man1
+manual: build/$(FLAVOUR)/deviceparameter.1.gz
 
 clean:
-	rm -f deviceparameter
-	rm -f deviceparameter.1.gz
+	rm -Rf build
 
 .PHONY: clean

cmd/build-deb.sh

@@ -22,7 +22,7 @@ import (
 )
 
 const ApplicationVersionMajor = 0
-const ApplicationVersionMinor = 3
+const ApplicationVersionMinor = 4
 const ApplicationVersionPatch = 0
 
 var ApplicationBuildDate string
@@ -129,7 +129,7 @@ func parseValue(opts Options) ([]byte, bool, error) {
 		return nil, false, errors.New("Multiple values specified for parameter")
 	}
 
-	return value, true, err
+	return value, c > 0, err
 }
 
 type Options struct {