From 7d93f1e753b97c895c5e3660ab8208478b47f6c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Erik=20Hedenstro=CC=88m?= <erik@hedenstroem.com>
Date: Fri, 30 Sep 2016 11:37:20 +0200
Subject: [PATCH] Tweaked ci build file

---
 .gitlab-ci.yml                               | 27 +++++---------------
 {consul-backup => cmd/consul-backup}/main.go |  0
 {genpasswd => cmd/genpasswd}/main.go         |  0
 3 files changed, 7 insertions(+), 20 deletions(-)
 rename {consul-backup => cmd/consul-backup}/main.go (100%)
 rename {genpasswd => cmd/genpasswd}/main.go (100%)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 71e935d..0c55e0c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,8 +1,8 @@
 image: registry.hedenstroem.com/gitlab/gitlab-builder-go:1.7.1
 
 before_script:
-  - export GOROOT=${GO_HOME}
-  - export GOPATH=${CI_PROJECT_DIR}/_build
+  - export GOPATH=${CI_PROJECT_DIR}/go
+  - export GOBIN=${GOPATH}/bin
   - export PATH=${GOPATH}/bin:${GOROOT}/bin:$PATH
 
 stages:
@@ -10,36 +10,23 @@ stages:
   - deploy
   - trigger
 
-genpasswd:
+compile:
   stage: build
   only:
     - master
   script:
-    - go get golang.org/x/crypto/pbkdf2
-    - go build -o _build/bin/genpasswd ./genpasswd
+    - go get ./...
   artifacts:
     paths:
-      - _build/bin/genpasswd
-
-consul-backup:
-  stage: build
-  only:
-    - master
-  script:
-    - go get github.com/hashicorp/consul/api
-    - go get github.com/docopt/docopt-go
-    - go build -o _build/bin/consul-backup ./consul-backup
-  artifacts:
-    paths:
-      - _build/bin/consul-backup
+      - go/bin/
 
 aws_s3:
   stage: deploy
   only:
     - master
   script:
-    - aws s3 cp _build/bin/consul-backup s3://s3.erlang.ninja/consul_proxy/extras/consul-backup
-    - aws s3 cp _build/bin/genpasswd s3://s3.erlang.ninja/consul_proxy/extras/genpasswd
+    - aws s3 cp go/bin/genpasswd s3://s3.erlang.ninja/consul_proxy/extras/genpasswd
+    - aws s3 cp go/bin/consul-backup s3://s3.erlang.ninja/consul_proxy/extras/consul-backup
 
 trigger:
   stage: trigger
diff --git a/consul-backup/main.go b/cmd/consul-backup/main.go
similarity index 100%
rename from consul-backup/main.go
rename to cmd/consul-backup/main.go
diff --git a/genpasswd/main.go b/cmd/genpasswd/main.go
similarity index 100%
rename from genpasswd/main.go
rename to cmd/genpasswd/main.go
-- 
GitLab