From 2ffda69ca827bdd9a9cf7736abc64a82e8c38ad8 Mon Sep 17 00:00:00 2001 From: kemonine Date: Sat, 19 Sep 2020 17:57:32 -0400 Subject: [PATCH 1/3] Enable cross platform builds / be more specific about output arch from drone --- .drone.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.drone.yml b/.drone.yml index d228748..e0b75ff 100644 --- a/.drone.yml +++ b/.drone.yml @@ -27,11 +27,11 @@ steps: path: /drone/src/out commands: - cd /drone/src - - go build -o out/wifi cmd/wifi/wifi.go - - go build -o out/inotify cmd/inotify/inotify.go - - go build -o out/gui cmd/gui/gui.go - - go build -o out/fan cmd/fan/fan.go - - go build -o out/hdmi cmd/hdmi/hdmi.go + - env GOOS=linux GOARCH=arm64 go build -o out/wifi cmd/wifi/wifi.go + - env GOOS=linux GOARCH=arm64 go build -o out/inotify cmd/inotify/inotify.go + - env GOOS=linux GOARCH=arm64 go build -o out/gui cmd/gui/gui.go + - env GOOS=linux GOARCH=arm64 go build -o out/fan cmd/fan/fan.go + - env GOOS=linux GOARCH=arm64 go build -o out/hdmi cmd/hdmi/hdmi.go - cp CHANGELOG.md out/ - name: gitea-release image: plugins/gitea-release From ab925c4b2c4ede7df785cc122c76b1c7e15423ca Mon Sep 17 00:00:00 2001 From: kemonine Date: Sat, 19 Sep 2020 18:05:35 -0400 Subject: [PATCH 2/3] Remove arch check from drone now that multi-arch builds are enabled --- .drone.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.drone.yml b/.drone.yml index e0b75ff..37979ba 100644 --- a/.drone.yml +++ b/.drone.yml @@ -7,10 +7,6 @@ trigger: event: - tag -platform: - os: linux - arch: arm64 - volumes: - name: cache temp: {} From 0c2c136413511f9e29731bb5fd4f7b22c892e54f Mon Sep 17 00:00:00 2001 From: kemonine Date: Sat, 19 Sep 2020 18:12:57 -0400 Subject: [PATCH 3/3] Fix build --- cmd/gui/gui.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cmd/gui/gui.go b/cmd/gui/gui.go index 9b05cf7..973757c 100644 --- a/cmd/gui/gui.go +++ b/cmd/gui/gui.go @@ -4,6 +4,7 @@ import ( "fmt" "log" "os" + "time" "github.com/knadh/koanf/providers/confmap" "github.com/knadh/koanf/providers/posflag" @@ -33,7 +34,7 @@ func main() { log.Print("Loading config") // Load the config file - pfConfig, _ := config.LoadConfig() + pfConfig, configFileProvider := config.LoadConfig() log.Printf("%v", pfConfig) pfConfig.Print()