Minor tweaks to the CI pipeline

.gitlab-ci.yml

@@ -25,12 +25,14 @@ build:
     paths:
       - feudalClient
 
-deploy_dev:
+deploy-dev:
   stage: deploy
-  environment:
-    name: dev
   only:
     - dev
+  environment:
+    name: dev
+  dependencies:
+    - build
   script:
     - eval $(ssh-agent -s)
     - echo "$SSH_PRIVATE_KEY" | ssh-add -
@@ -39,12 +41,14 @@ deploy_dev:
     - echo "$SSH_KNOWN_HOSTS" > ~/.ssh/known_hosts
     - rsync -v feudalClient $DEV_USER@$DEV_HOST:bin/feudalClientDev
 
-deploy_master:
+deploy-master:
   stage: deploy
-  environment:
-    name: master
   only:
     - master
+  environment:
+    name: master
+  dependencies:
+    - build
   script:
     - eval $(ssh-agent -s)
     - echo "$SSH_PRIVATE_KEY" | ssh-add -

Makefile

@@ -3,20 +3,20 @@ PKG := "git.scc.kit.edu/feudal/$(PROJECT_NAME)"
 PKG_LIST := $(shell go list ${PKG}/... | grep -v /vendor/)
 GO_FILES := $(shell find . -name '*.go' | grep -v /vendor/ | grep -v _test.go)
 
-.PHONY: all dep build clean test coverage coverhtml lint
+.PHONY: all dep build clean test  lint
 
 all: build
 
-lint: ## Lint the files
+dep: ## Get the dependencies
+	@go get -v -d ./...
+	@go get -u golang.org/x/lint/golint
+
+lint: dep ## Lint the files
 	@golint -set_exit_status ${PKG_LIST}
 
 test: ## Run unittests
 	@go test -short ${PKG_LIST}
 
-dep: ## Get the dependencies
-	@go get -v -d ./...
-	@go get -u golang.org/x/lint/golint
-
 build: dep ## Build the binary file
 	@go build -i -v $(PKG)