[VOL-5222] - Upgrade golang version for VOLTHA jobs
makefiles/docker/include.mk
----------------------------
o bash: -c: line 2: syntax error: unexpected end of file
+ Lack of a semi-colon within "&& {}" contributes to syntax error.
+ Copy in latest is-stdin macro definition from repo:onf-make:
+ https://gerrit.opencord.org/plugins/gitiles/onf-make/+/refs/heads/master/makefiles/docker/include.mk#42
makefiles/lint/golang/sca.mk
----------------------------
o Remove stray debugging message.
makefiles/lint/golang/include.mk
----------------------------
o Replace echo with printf for consistent golang help target display.
o golang-version and golang-upgrade will be added by a different patch.
Change-Id: I3d02f6e1c199c2ffac45075f59a3e1d431289d53
diff --git a/VERSION b/VERSION
index a49cad2..f9ae2cc 100755
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-5.5.0-dev
+5.5.0-dev1
diff --git a/makefiles/docker/include.mk b/makefiles/docker/include.mk
index 7e43670..1ea495e 100644
--- a/makefiles/docker/include.mk
+++ b/makefiles/docker/include.mk
@@ -25,12 +25,14 @@
docker-run += --debug
endif
docker-run += run --rm --user $$(id -u):$$(id -g)# # Docker command stem
-docker-run-app = $(docker-run) -v ${CURDIR}:/app# # w/filesystem mount
+docker-run-app = $(docker-run) -v ${CURDIR}:/app# # w/filesystem mount
-## GhostBusters: Cross the streams
-## Always pass -it to attach streams, jenkins + docker == test -t fail
-is-stdin = $(shell test -t 0 && { echo '--interactive' })# # Attach streams if interactive
-is-stdin += --tty# # Attach stdout else jenkins::docker is silent
+# -----------------------------------------------------------------------
+# --interactive: Attach streams when stdout (fh==0) defined
+# --tty : Always create a pseudo-tty else jenkins:docker is silent
+# -----------------------------------------------------------------------
+is-stdin = $(shell test -t 0 && { echo '--interactive'; })
+is-stdin += --tty
# Docker volume mounts: container:/app/release <=> localhost:{pwd}/release
vee-golang = -v gocache-${VOLTHA_TOOLS_VERSION}:/go/pkg
@@ -38,7 +40,12 @@
# Tool Containers
PROTOC = $(docker-run) -v ${CURDIR}:/app $(is-stdin) $(vee-citools)-protoc protoc
-PROTOC_SH = $(docker-run) -v ${CURDIR}:/go/src/github.com/opencord/voltha-protos/v5 $(is-stdin) --workdir=/go/src/github.com/opencord/voltha-protos/v5 $(vee-citools)-protoc sh -c
+
+PROTOC_SH := $(docker-run)
+PROTOC_SH += -v ${CURDIR}:/go/src/github.com/opencord/voltha-protos/v5
+PROTOC_SH += $(is-stdin) --workdir=/go/src/github.com/opencord/voltha-protos/v5
+PROTOC_SH += $(vee-citools)-protoc sh -c
+
GO = $(docker-run) -v ${CURDIR}:/app $(is-stdin) -v gocache:/.cache $(vee-golang) $(vee-citools)-golang go
docker-sh = $(PROTOC_SH)
diff --git a/makefiles/lint/golang/include.mk b/makefiles/lint/golang/include.mk
index 48b1981..22271ea 100644
--- a/makefiles/lint/golang/include.mk
+++ b/makefiles/lint/golang/include.mk
@@ -25,7 +25,8 @@
## Intent: Display command usage
## -----------------------------------------------------------------------
help::
- @echo ' lint-golang Syntax check golang sources'
+ @printf ' %-33.33s %s\n' 'lint-golang' \
+ 'Syntax check golang sources'
@echo ' FIX=1 In-place file update'
include $(MAKEDIR)/lint/golang/sca.mk
diff --git a/makefiles/lint/golang/sca.mk b/makefiles/lint/golang/sca.mk
index 7df3cd6..1cd41ac 100644
--- a/makefiles/lint/golang/sca.mk
+++ b/makefiles/lint/golang/sca.mk
@@ -24,7 +24,6 @@
GOLANG_FILES ?= $(error GOLANG_FILES= is required)
-$(info loading)
## -----------------------------------------------------------------------
## Intent: Use the golang command to perform syntax checking.
## o If UNSTABLE=1 syntax check all sources