Merge pull request sorintlab#715 from sgotti/use_makefile

Use a Makefile for all build tasks

Author: sgotti

.agola/config.jsonnet

@@ -33,8 +33,8 @@ local task_build_go(version, arch) = {
   steps: [
     { type: 'clone' },
     { type: 'restore_cache', keys: ['cache-sum-{{ md5sum "go.sum" }}', 'cache-date-'], dest_dir: '/go/pkg/mod/cache' },
-    { type: 'run', command: './build' },
-    { type: 'run', command: './test' },
+    { type: 'run', command: 'make' },
+    { type: 'run', command: 'make test' },
     { type: 'run', name: 'build integration tests binary', command: 'go test -c ./tests/integration/ -o bin/integration-tests' },
     { type: 'save_cache', key: 'cache-sum-{{ md5sum "go.sum" }}', contents: [{ source_dir: '/go/pkg/mod/cache' }] },
     { type: 'save_cache', key: 'cache-date-{{ year }}-{{ month }}-{{ day }}', contents: [{ source_dir: '/go/pkg/mod/cache' }] },

.travis.yml

@@ -13,4 +13,4 @@ env:
 install: true
 
 script:
-  GO111MODULE=on ./test
+  - GO111MODULE=on make test

Makefile

@@ -0,0 +1,45 @@
+PROJDIR=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
+
+# change to project dir so we can express all as relative paths
+$(shell cd $(PROJDIR))
+
+REPO_PATH=github.com/sorintlab/stolon
+
+VERSION ?= $(shell scripts/git-version.sh)
+
+LD_FLAGS="-w -X $(REPO_PATH)/cmd.Version=$(VERSION)"
+
+$(shell mkdir -p bin )
+
+
+.PHONY: all
+all: build
+
+.PHONY: build
+build: sentinel keeper proxy stolonctl
+
+.PHONY: test
+test: build
+	./test
+
+.PHONY: sentinel keeper proxy stolonctl docker
+
+keeper:
+	GO111MODULE=on go build -ldflags $(LD_FLAGS) -o $(PROJDIR)/bin/stolon-keeper $(REPO_PATH)/cmd/keeper
+
+sentinel:
+	CGO_ENABLED=0 GO111MODULE=on go build -ldflags $(LD_FLAGS) -o $(PROJDIR)/bin/stolon-sentinel $(REPO_PATH)/cmd/sentinel
+
+proxy:
+	CGO_ENABLED=0 GO111MODULE=on go build -ldflags $(LD_FLAGS) -o $(PROJDIR)/bin/stolon-proxy $(REPO_PATH)/cmd/proxy
+
+stolonctl:
+	CGO_ENABLED=0 GO111MODULE=on go build -ldflags $(LD_FLAGS) -o $(PROJDIR)/bin/stolonctl $(REPO_PATH)/cmd/stolonctl
+
+.PHONY: docker
+docker: build
+	if [ -z $${PGVERSION} ]; then echo 'PGVERSION is undefined'; exit 1; fi; \
+	if [ -z $${TAG} ]; then echo 'TAG is undefined'; exit 1; fi; \
+	export TEMPFILE="$$(mktemp)"; \
+	sed -e "s/\$${PGVERSION}/$${PGVERSION}/" examples/kubernetes/image/docker/Dockerfile.template > $${TEMPFILE}; \
+	docker build -t $${TAG} -f $${TEMPFILE} .

README.md

@@ -73,7 +73,7 @@ Anyway it's quite easy to reset a cluster from scratch keeping the current maste
 To build stolon we usually test and support the latest two major versions of Go like in the [Go release policy](https://golang.org/doc/devel/release.html#policy).
 
 ```
-./build
+make
 ```
 
 ## High availability

build

@@ -14,11 +14,14 @@ Additional images are available:
 
 * `master-pg10`: automatically built after every commit to the master branch.
 
-In the [image](image/docker) directory you'll find a Makefile to build the image used in this example (starting from the official postgreSQL images). The Makefile generates the Dockefile from a template Dockerfile where you have to define the wanted postgres version and image tag (`PGVERSION` and `TAG` mandatory variables).
+In the [image](image/docker) directory you'll find a Dockerfile to build the image used in this example (starting from the official postgreSQL images).
+
+To build the image used in this example just execute (from the project root) `make` with the `docker` target providing the mandatory `PGVERSION` and `TAG` variables.
+
 For example, if you want to build an image named `stolon:master-pg10` that uses postgresql 10 you should execute:
 
 ```
-make PGVERSION=10 TAG=stolon:master-pg10
+make PGVERSION=10 TAG=stolon:master-pg10 docker
 ```
 
 Once the image is built you should push it to the docker registry used by your kubernetes infrastructure.
@@ -112,7 +115,7 @@ stolon-proxy-service   <none>                                    stolon-cluster=
 
 #### Connect to the proxy service
 
-The password for the stolon user will be the value specified in your `secret.yaml` above (or `password1` if you did not change it). 
+The password for the stolon user will be the value specified in your `secret.yaml` above (or `password1` if you did not change it).
 
 ```
 psql --host 10.247.50.217 --port 5432 postgres -U stolon -W
@@ -209,4 +212,3 @@ For PostgreSQL major version upgrade, see [PostgreSQL upgrade](postgresql_upgrad
 For any PostgreSQL upgrade, check PostgreSQL release note for any additional upgrade note.
 
 For stolon upgrade: TODO
-

examples/kubernetes/README.md

@@ -14,11 +14,14 @@ Additional images are available:
 
 * `master-pg10`: automatically built after every commit to the master branch.
 
-In the [image](../kubernetes/image/docker) directory you'll find a Makefile to build the image used in this example (starting from the official postgreSQL images). The Makefile generates the Dockefile from a template Dockerfile where you have to define the wanted postgres version and image tag (`PGVERSION` and `TAG` mandatory variables).
+In the [image](../kubernetes/image/docker) directory you'll find a Dockerfile to build the image used in this example (starting from the official postgreSQL images).
+
+To build the image used in this example just execute (from the project root) `make` with the `docker` target providing the mandatory `PGVERSION` and `TAG` variables.
+
 For example, if you want to build an image named `stolon:master-pg10` that uses postgresql 10 you should execute:
 
 ```
-make PGVERSION=10.3 TAG=stolon:master-pg10
+make PGVERSION=10 TAG=stolon:master-pg10 docker
 ```
 
 Once the image is built you should push it to the docker registry used by your swarm infrastructure.

examples/kubernetes/image/docker/Makefile

@@ -62,7 +62,7 @@ function main {
 		export GOARCH="amd64"
 
 		pushd stolon >/dev/null
-			./build
+			make
 		popd >/dev/null
 
 		TARGET="stolon-${VER}-${GOOS}-${GOARCH}"

examples/swarm/README.md

@@ -27,23 +27,10 @@ touch $HOME/.kube/config
 export KUBECONFIG=$HOME/.kube/config
 sudo -E minikube start --vm-driver=none
 
-# Fix build to work with the right import path also when building github forked repositories
-if [[ ! -e ~/workspace/src/github.com/sorintlab/stolon ]]; then
-  mkdir -p ~/workspace/src/github.com/sorintlab
-  ln -s /home/runner/stolon ~/workspace/src/github.com/sorintlab/stolon
-fi
-
 ## Temporary hack disable checksum verification since semaphore has go 1.11.0 that had a bug causing different checksums than the right one generated by go 1.11.2
 rm go.sum
 
-./build
-
-
-pushd examples/kubernetes/image/docker
-
-make PGVERSION=10 TAG=stolon:master-pg10
-
-popd
+make PGVERSION=10 TAG=stolon:master-pg10 docker
 
 ./bin/stolonctl --cluster-name kube-stolon --store-backend kubernetes --kube-resource-kind configmap init -y
 
@@ -63,7 +50,7 @@ COUNT=0
 while [ $COUNT -lt 120 ]; do
 	OUT=$(./bin/stolonctl --cluster-name kube-stolon --store-backend kubernetes --kube-resource-kind configmap clusterdata read | jq .cluster.status.phase)
 	if [ "$OUT" == '"normal"' ]; then
-		OK=true	
+		OK=true
 		break
 	fi
 
@@ -82,4 +69,3 @@ if [ "$OK" != "true" ]; then
 fi
 
 echo "stolon cluster successfully setup"
-

scripts/build-binary

@@ -29,13 +29,7 @@ sudo sh -c 'echo "deb http://apt.postgresql.org/pub/repos/apt/ $(lsb_release -cs
 sudo sh -c 'echo "deb http://apt.postgresql.org/pub/repos/apt/ $(lsb_release -cs)-pgdg main 11" > /etc/apt/sources.list.d/pgdg.list'
 wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | sudo apt-key add -
 sudo apt-get update
-sudo apt-get -y install postgresql-9.5 postgresql-9.6 postgresql-10 postgresql-11 eatmydata
-
-# Fix build to work with the right import path also when building github forked repositories
-if [[ ! -e ~/workspace/src/github.com/sorintlab/stolon ]]; then
-  mkdir -p ~/workspace/src/github.com/sorintlab
-  ln -s /home/runner/stolon ~/workspace/src/github.com/sorintlab/stolon
-fi
+sudo apt-get -y install postgresql-9.5 postgresql-9.6 postgresql-10 postgresql-11
 
 # Run tests
 export ETCD_BIN="${PWD}/etcd/etcd-v3.2.11-linux-amd64/etcd"
@@ -58,8 +52,7 @@ export PARALLEL=5
 ## Temporary hack disable checksum verification since semaphore has go 1.11.0 that had a bug causing different checksums than the right one generated by go 1.11.2
 rm go.sum
 
-LD_LIBRARY_PATH=${LD_LIBRARY_PATH:+"$LD_LIBRARY_PATH:"}/usr/lib/libeatmydata
-LD_PRELOAD=${LD_PRELOAD:+"$LD_PRELOAD "}libeatmydata.so
+make
 
 # Test with postgresql 9.5
 echo "===== Testing with postgreSQL 9.5 ====="

scripts/semaphore-k8s.sh

@@ -2,7 +2,7 @@
 
 # Test script code thanks to coreos/etcd
 #
-# Run all etcd tests
+# Run all tests
 # ./test
 # ./test -v
 #
@@ -22,8 +22,6 @@ fi
 ORG_PATH="github.com/sorintlab"
 REPO_PATH="${ORG_PATH}/stolon"
 
-./build
-
 # test all packages excluding integration tests
 IGNORE_PKGS="(vendor/|tests/integration)"
 PACKAGES=$(find . -name \*_test.go | while read -r a; do dirname "$a"; done | sort | uniq | grep -vE "$IGNORE_PKGS" | sed "s|\./||g")
@@ -38,12 +36,12 @@ echo "Running tests..."
 COVER=${COVER:-"-cover"}
 
 # Use only of specific go version to run gofmt since it'll break when we'll use go 1.10 and go 1.11
-GOFMT_VERSION="go1.11"
+GOFMT_VERSION="go1.13"
 
 MAJOR_GOVERSION=$( echo -n $(go version) | grep -o 'go1\.[0-9]*' || true )
 if [ "${MAJOR_GOVERSION}" == "${GOFMT_VERSION}" ]; then
 	echo "Checking gofmt..."
-	fmtRes=$(gofmt -l $(find . -type f -name '*.go' ! -path './vendor/*'))
+	fmtRes=$(gofmt -l $(find . -type f -name '*.go' ! -path './vendor/*' ! -path '*/\.*'))
 	if [ -n "${fmtRes}" ]; then
 		echo -e "gofmt checking failed:\n${fmtRes}"
 		exit 255