morpheusv2

commit aa0897f24a25269e7bc4db7caf952c8d35169678
parent e43de89750e78c111106de7b2c1887e8c9135312
Author: Marcel <MTRNord@users.noreply.github.com>
Date:   Tue,  1 May 2018 18:37:17 +0200

Fix CI (#3)

* Make sure we used the installed go files instead of the ones from vendor

* Fix copying

* Fix linter and QT Source Copy

* Debug whats happening inside the qtSrc Copy

* Remove QT Src before copy

* Remove ls call that broke the CI

* Make linter happy

* Keep QT outside of Dep

* Ignore qt in dep

* Fix ignored

* Readd lock

* Fix deb building

* Fix early exit

Diffstat:
M
.circleci/config.yml
 | 
4
++--
M
Gopkg.lock
 | 
8
+-------
M
Gopkg.toml
 | 
7
+++----
M
cmd/root.go
 | 
3
---
M
deb.json
 | 
4
++--
A
linter.json
 | 
23
+++++++++++++++++++++++
M
pkg/app/main.go
 | 
1
+
M
pkg/mainThreadHelper.go
 | 
2
+-

8 files changed, 33 insertions(+), 19 deletions(-)
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -41,7 +41,7 @@ jobs:
       - run:
           name: Run Build
           working_directory: /home/user/work/src/github.com/Nordgedanken/Morpheusv2/
-          command: $GOPATH/bin/qtdeploy build linux
+          command: /home/user/work/bin/qtdeploy build desktop
       - run:
           name: Prepare Deb Generating
           working_directory: /home/user/work/src/github.com/Nordgedanken/Morpheusv2/
@@ -86,7 +86,7 @@ jobs:
       - run:
           name: Run Build
           working_directory: /home/user/work/src/github.com/Nordgedanken/Morpheusv2/
-          command: $GOPATH/bin/qtdeploy build windows
+          command: /home/user/work/bin/qtdeploy build windows
       - store_artifacts:
           path: /home/user/work/src/github.com/Nordgedanken/Morpheusv2/deploy/windows/Morpheusv2.exe
           destination: Morpheusv2.exe
diff --git a/Gopkg.lock b/Gopkg.lock
@@ -25,15 +25,9 @@
   revision = "583c0c0531f06d5278b7d917446061adc344b5cd"
   version = "v1.0.1"
 
-[[projects]]
-  branch = "master"
-  name = "github.com/therecipe/qt"
-  packages = [".","core","gui","widgets"]
-  revision = "7038382d6c7bb5fd3957df56bbedf8ec4ca6b67c"
-
 [solve-meta]
   analyzer-name = "dep"
   analyzer-version = 1
-  inputs-digest = "a82e2ac4eccca051143202632fee6ebf07b015e82f3d04c4bc426be93aab708b"
+  inputs-digest = "9eae52af7d8c49e9a27a1863ba05582acb167fd5a5ce5bf23b6eb9288a20d0c2"
   solver-name = "gps-cdcl"
   solver-version = 1
diff --git a/Gopkg.toml b/Gopkg.toml
@@ -21,10 +21,8 @@
 #  version = "2.4.0"
 
 
-[[constraint]]
-  branch = "master"
-  name = "github.com/shibukawa/configdir"
+ignored = ["github.com/therecipe/qt/*"]
 
 [[constraint]]
   branch = "master"
-  name = "github.com/therecipe/qt"
+  name = "github.com/shibukawa/configdir"
+\ No newline at end of file
diff --git a/cmd/root.go b/cmd/root.go
@@ -22,8 +22,6 @@ import (
 	"github.com/spf13/cobra"
 )
 
-var cfgFile string
-
 // rootCmd represents the base command when called without any subcommands
 var rootCmd = &cobra.Command{
 	Use:   "Morpheusv2",
@@ -48,5 +46,4 @@ func Execute() {
 		fmt.Println(err)
 		os.Exit(1)
 	}
-	os.Exit(0)
 }
diff --git a/deb.json b/deb.json
@@ -1,7 +1,7 @@
 {
   "name": "Morpheusv2",
   "maintainer": "MTRNord <info@nordgedanken.de>",
-  "version": "0.0.1",
+  "version": "0.1.0",
   "arch": "amd64",
   "files": [
     {
@@ -50,7 +50,7 @@
       "description":"A Matrix client written in Go-QT ",
       "generic-name":"Matrix Client",
       "exec":"/usr/bin/Morpheusv2.sh",
-      "icon":"qml/resources/logos/MorpheusBig.png",
+      "icon":"pkg/qml/resources/logos/MorpheusBig.png",
       "type":"Application",
       "keywords":"matrix;Morpheusv2",
       "startup-notify": false,
diff --git a/linter.json b/linter.json
@@ -0,0 +1,22 @@
+{
+  "Vendor": true,
+  "Cyclo": 12,
+  "Deadline": "5m",
+  "Enable": [
+    "vetshadow",
+    "deadcode",
+    "gocyclo",
+    "golint",
+    "varcheck",
+    "structcheck",
+    "ineffassign",
+    "gas",
+    "misspell",
+    "unparam",
+    "errcheck",
+    "vet",
+    "megacheck",
+    "goconst",
+    "maligned"
+  ]
+}
+\ No newline at end of file
diff --git a/pkg/app/main.go b/pkg/app/main.go
@@ -24,6 +24,7 @@ import (
 	"path/filepath"
 )
 
+// Start prepares the Main QT Window and opens it
 func Start(args []string) error {
 	log.Println("Starting Morpheus v2")
 
diff --git a/pkg/mainThreadHelper.go b/pkg/mainThreadHelper.go
@@ -27,7 +27,7 @@ func Main() {
 // queue of work to run in main thread.
 var mainfunc = make(chan func())
 
-// do runs f on the main thread.
+// Do runs f on the main thread.
 func Do(f func()) {
 	done := make(chan bool, 1)
 	mainfunc <- func() {