Skip to content

Commit b9b3e57

Browse files
joerg84neunhoef
authored andcommitted
Made full compilation the default make target. (#409)
1 parent 45a2ef2 commit b9b3e57

File tree

2 files changed

+22
-18
lines changed

2 files changed

+22
-18
lines changed

Makefile

Lines changed: 21 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -27,20 +27,20 @@ GOVERSION := 1.10.0-alpine
2727
PULSAR := $(GOBUILDDIR)/bin/pulsar$(shell go env GOEXE)
2828
GOASSETSBUILDER := $(GOBUILDDIR)/bin/go-assets-builder$(shell go env GOEXE)
2929

30-
DOCKERFILE := Dockerfile
30+
DOCKERFILE := Dockerfile
3131
DOCKERTESTFILE := Dockerfile.test
3232
DOCKERDURATIONTESTFILE := tests/duration/Dockerfile
3333

34-
ifndef LOCALONLY
34+
ifndef LOCALONLY
3535
PUSHIMAGES := 1
3636
IMAGESHA256 := true
3737
else
3838
IMAGESHA256 := false
3939
endif
4040

41-
ifdef IMAGETAG
41+
ifdef IMAGETAG
4242
IMAGESUFFIX := :$(IMAGETAG)
43-
else
43+
else
4444
IMAGESUFFIX := :dev
4545
endif
4646

@@ -88,8 +88,8 @@ TESTBINNAME := $(PROJECT)_test
8888
TESTBIN := $(BINDIR)/$(TESTBINNAME)
8989
DURATIONTESTBINNAME := $(PROJECT)_duration_test
9090
DURATIONTESTBIN := $(BINDIR)/$(DURATIONTESTBINNAME)
91-
RELEASE := $(GOBUILDDIR)/bin/release
92-
GHRELEASE := $(GOBUILDDIR)/bin/github-release
91+
RELEASE := $(GOBUILDDIR)/bin/release
92+
GHRELEASE := $(GOBUILDDIR)/bin/github-release
9393

9494
TESTLENGTHOPTIONS := -test.short
9595
TESTTIMEOUT := 30m
@@ -98,7 +98,7 @@ ifeq ($(LONG), 1)
9898
TESTTIMEOUT := 180m
9999
endif
100100
ifdef VERBOSE
101-
TESTVERBOSEOPTIONS := -v
101+
TESTVERBOSEOPTIONS := -v
102102
endif
103103

104104
SOURCES := $(shell find $(SRCDIR) -name '*.go' -not -path './test/*')
@@ -121,10 +121,14 @@ ARANGOSYNCTESTCTRLBINNAME := $(PROJECT)_sync_test_ctrl
121121
ARANGOSYNCTESTCTRLBIN := $(BINDIR)/$(ARANGOSYNCTESTCTRLBINNAME)
122122

123123
.PHONY: all
124-
all: check-vars build
124+
all: check-vars verify-generated build
125+
126+
.PHONY: compile
127+
compile: check-vars build
125128

129+
# allall is now obsolete
126130
.PHONY: allall
127-
allall: check-vars verify-generated build
131+
allall: all
128132

129133
#
130134
# Tip: Run `eval $(minikube docker-env)` before calling make if you're developing on minikube.
@@ -191,7 +195,7 @@ ifdef PUSHIMAGES
191195
docker push $(OPERATORIMAGE)
192196
endif
193197

194-
# Manifests
198+
# Manifests
195199

196200
.PHONY: manifests
197201
manifests: $(GOBUILDDIR)
@@ -217,12 +221,12 @@ run-unit-tests: $(SOURCES)
217221
$(REPOPATH)/pkg/util/k8sutil \
218222
$(REPOPATH)/pkg/util/k8sutil/test \
219223
$(REPOPATH)/pkg/util/probe \
220-
$(REPOPATH)/pkg/util/validation
224+
$(REPOPATH)/pkg/util/validation
221225

222226
$(TESTBIN): $(GOBUILDDIR) $(SOURCES)
223227
@mkdir -p $(BINDIR)
224228
CGO_ENABLED=0 go test -c -installsuffix netgo -ldflags "-X main.projectVersion=$(VERSION) -X main.projectBuild=$(COMMIT)" -o $(TESTBIN) $(REPOPATH)/tests
225-
229+
226230

227231
.PHONY: docker-test
228232
docker-test: $(TESTBIN)
@@ -270,7 +274,7 @@ endif
270274

271275
$(DURATIONTESTBIN): $(SOURCES)
272276
CGO_ENABLED=0 go build -installsuffix cgo -ldflags "-X main.projectVersion=$(VERSION) -X main.projectBuild=$(COMMIT)" -o $(DURATIONTESTBINNAME) $(REPOPATH)/tests/duration
273-
277+
274278

275279
.PHONY: docker-duration-test
276280
docker-duration-test: $(DURATIONTESTBIN)
@@ -327,20 +331,20 @@ $(RELEASE): $(GOBUILDDIR) $(SOURCES) $(GHRELEASE)
327331
.PHONY: build-ghrelease
328332
build-ghrelease: $(GHRELEASE)
329333

330-
$(GHRELEASE): $(GOBUILDDIR)
334+
$(GHRELEASE): $(GOBUILDDIR)
331335
GOPATH=$(GOBUILDDIR) go build -o $(GHRELEASE) github.com/aktau/github-release
332336

333337
.PHONY: release-patch
334338
release-patch: $(RELEASE)
335-
GOPATH=$(GOBUILDDIR) $(RELEASE) -type=patch
339+
GOPATH=$(GOBUILDDIR) $(RELEASE) -type=patch
336340

337341
.PHONY: release-minor
338342
release-minor: $(RELEASE)
339343
GOPATH=$(GOBUILDDIR) $(RELEASE) -type=minor
340344

341345
.PHONY: release-major
342346
release-major: $(RELEASE)
343-
GOPATH=$(GOBUILDDIR) $(RELEASE) -type=major
347+
GOPATH=$(GOBUILDDIR) $(RELEASE) -type=major
344348

345349
## Kubernetes utilities
346350

@@ -363,7 +367,7 @@ redeploy-operator: delete-operator manifests
363367
kubectl apply -f $(MANIFESTPATHDEPLOYMENT)
364368
kubectl apply -f $(MANIFESTPATHDEPLOYMENTREPLICATION)
365369
kubectl apply -f $(MANIFESTPATHTEST)
366-
kubectl get pods
370+
kubectl get pods
367371

368372
## ArangoSync Tests
369373

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ helm install https://github.com/arangodb/kube-arangodb/releases/download/0.3.11/
136136
## Building
137137

138138
```bash
139-
DOCKERNAMESPACE=<your dockerhub account> make allall
139+
DOCKERNAMESPACE=<your dockerhub account> make
140140
kubectl apply -f manifests/arango-deployment-dev.yaml
141141
# To use `ArangoLocalStorage`, also run
142142
kubectl apply -f manifests/arango-storage-dev.yaml

0 commit comments

Comments
 (0)