[VOL-5056] - Build and release voltha-protos
go.mod
------
o Update protobuf and grpc module versions.
Change-Id: I873f4f431e76c7952e5f8f20ebac788dfa35119a
diff --git a/Makefile b/Makefile
index 23f858c..7a9991f 100755
--- a/Makefile
+++ b/Makefile
@@ -203,13 +203,8 @@
go-protos: voltha.pb
$(call banner-enter,target $@)
-
-# $(docker-sh) $(quote-double) /bin/ls -ld /go/src $(quote-double)
-# ${PROTOC_SH} $(quote-double) \
-# find /go/src -print0 | xargs -0 /bin/ls -ld \
-# $(quote-double)
-
@echo "** Creating *.go.pb files"
+
${PROTOC_SH} $(quote-double)\
set -e -o pipefail; \
for x in ${PROTO_FILES}; do \
@@ -318,7 +313,10 @@
## -----------------------------------------------------------------------
.PHONY: show-proto-files
show-proto-files:
- echo -e "PROTO_FILES:\n$(PROTO_FILES)" | tr ' ' '\n'
+
+ $(call banner-enter,Target $@)
+ @echo -e "PROTO_FILES:\n$(PROTO_FILES)" | tr ' ' '\n'
+ $(call banner-leave,Target $@)
# [EOF]
diff --git a/go.mod b/go.mod
index 0eee118..d7ec472 100755
--- a/go.mod
+++ b/go.mod
@@ -4,6 +4,6 @@
require (
github.com/golang/protobuf v1.5.2
- google.golang.org/genproto v0.0.0-20220208230804-65c12eb4c068
- google.golang.org/grpc v1.44.0
+ google.golang.org/genproto v0.0.0-20230711160842-782d3b101e98
+ google.golang.org/grpc v1.56.2
)
diff --git a/makefiles/consts.mk b/makefiles/consts.mk
index c1306ac..8961b3a 100644
--- a/makefiles/consts.mk
+++ b/makefiles/consts.mk
@@ -31,13 +31,21 @@
export quote-double := $(null)"$(null)#"
# [DEBUG] make {target} HIDE=
-HIDE ?= @
+HIDE ?= @
env-clean ?= /usr/bin/env --ignore-environment
xargs-n1 := xargs -0 -t -n1 --no-run-if-empty
xargs-n1-clean := $(env-clean) $(xargs-n1)
## -----------------------------------------------------------------------
+## Intent: NOP command for targets whose dependencies do all heavy lifting
+## -----------------------------------------------------------------------
+## usage: foo bar tans
+## <tab>$(nop-command)
+## -----------------------------------------------------------------------
+nop-cmd := :
+
+## -----------------------------------------------------------------------
## Default shell:
## o set -e enable error checking
## o set -u report undefined errors
diff --git a/makefiles/virtualenv.mk b/makefiles/virtualenv.mk
index 93eb29d..ceaf389 100644
--- a/makefiles/virtualenv.mk
+++ b/makefiles/virtualenv.mk
@@ -1,5 +1,5 @@
# -*- makefile -*-
-## -----------------------------------------------------------------------
+# -----------------------------------------------------------------------
# Copyright 2017-2023 Open Networking Foundation (ONF) and the ONF Contributors
#
# Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,7 +13,7 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
-## -----------------------------------------------------------------------
+# -----------------------------------------------------------------------
# https://gerrit.opencord.org/plugins/gitiles/onf-make
# ONF.makefile.version = 1.0
# -----------------------------------------------------------------------