Merge pull request #11 from Shopify/dev-setup-improvements

Makefile improvements + working CI

Makefile

@@ -1,14 +1,27 @@
-.PHONY: test
+.PHONY: test install clean
 
-BUILD_DIR     := build
-COPYDB_BIN    := ghostferry-copydb
-COPYDB_TARGET := $(BUILD_DIR)/$(COPYDB_BIN)
+GOBIN           := $(GOPATH)/bin
 
-$(COPYDB_TARGET): $(BUILD_DIR)
-	@go version
-	go build -o $(BUILD_DIR)/$(COPYDB_BIN) ./copydb/cmd
+COPYDB_TARGET   := $(GOBIN)/ghostferry-copydb
+COPYDB_PKG      := ./copydb/cmd
+
+SOURCES       := $(shell find . -name "*.go")
+
+define go_build_i
+	go build -i -o $(1) $(2)
+endef
 
+install: $(COPYDB_TARGET)
 
-$(BUILD_DIR):
-	mkdir -p $(BUILD_DIR)
+$(COPYDB_TARGET): $(GOBIN) $(SOURCES)
+	$(call go_build_i,$(COPYDB_TARGET),$(COPYDB_PKG))
+
+$(GOBIN):
+	mkdir -p $(GOBIN)
+
+test:
+	@go version
+	go test ./test $(TESTFLAGS)
 
+clean:
+	rm -f $(COPYDB_TARGET)

Vagrantfile

@@ -13,7 +13,7 @@ Vagrant.configure("2") do |config|
       chmod +x /usr/bin/gimme
       sudo -H -u vagrant gimme 1.8.3
       echo "source /home/vagrant/.gimme/envs/go1.8.3.env" >> /home/vagrant/.bashrc
-      echo 'GOPATH=$HOME/go' >> /home/vagrant/.bashrc
+      echo 'export GOPATH=$HOME/go' >> /home/vagrant/.bashrc
     fi
   SHELL
 

ci/02-setup-mysql.sh

@@ -1,6 +1,7 @@
 #!/bin/bash
 
-source test/envsetup.sh
+N1=gf.n1
+N2=gf.n2
 
 # TODO: at somepoint we can open source mysql-vending-machine so we don't
 #       have to do this hack and just clone from https

ci/files/circle-percona-apt-pin

@@ -0,0 +1,7 @@
+Package: *
+Pin: release o=Percona Development Team
+Pin-Priority: 1001
+
+Package: *
+Pin: release o=MySQL
+Pin-Priority: 1

circle.yml

@@ -1,7 +1,7 @@
 ---
 test:
   override:
-    - go test ./test
+    - go test ./test -v
 
 dependencies:
   pre: