Skip to content

Commit bb6612b

Browse files
author
Tim Middleton
committed
Minimize protoc generation
1 parent c9651e7 commit bb6612b

File tree

7 files changed

+24
-16
lines changed

7 files changed

+24
-16
lines changed

‎.github/workflows/build-compatability-1412.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ jobs:
8484
shell: bash
8585
run: |
8686
go get google.golang.org/grpc/cmd/protoc-gen-go-grpc@v1.3.0
87-
COHERENCE_BASE_IMAGE=gcr.io/distroless/java17-debian12 COHERENCE_VERSION=$COH_VERSION PROFILES=,-jakarta,javax,scope make clean generate-proto generate-proto-v1 build-test-images test-e2e-standalone-scope
87+
SKIP_PROTO_GENERATION=true COHERENCE_BASE_IMAGE=gcr.io/distroless/java17-debian12 COHERENCE_VERSION=$COH_VERSION PROFILES=,-jakarta,javax,scope make clean generate-proto generate-proto-v1 build-test-images test-e2e-standalone-scope
8888
8989
- uses: actions/upload-artifact@v4
9090
if: failure()
@@ -105,7 +105,7 @@ jobs:
105105
run: |
106106
echo "Running verify against $COH_VERSION"
107107
go get google.golang.org/grpc/cmd/protoc-gen-go-grpc@v1.3.0
108-
COHERENCE_BASE_IMAGE=gcr.io/distroless/java17-debian12 SECURE=true COHERENCE_IGNORE_INVALID_CERTS=true INCLUDE_LONG_RUNNING=true \
108+
SKIP_PROTO_GENERATION=true COHERENCE_BASE_IMAGE=gcr.io/distroless/java17-debian12 SECURE=true COHERENCE_IGNORE_INVALID_CERTS=true INCLUDE_LONG_RUNNING=true \
109109
COHERENCE_TLS_CERTS_PATH=`pwd`/test/utils/certs/guardians-ca.crt \
110110
COHERENCE_TLS_CLIENT_CERT=`pwd`/test/utils/certs/star-lord.crt \
111111
COHERENCE_TLS_CLIENT_KEY=`pwd`/test/utils/certs/star-lord.key \

‎.github/workflows/build-compatability-2206.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ jobs:
8585
shell: bash
8686
run: |
8787
go get google.golang.org/grpc/cmd/protoc-gen-go-grpc@v1.3.0
88-
COHERENCE_BASE_IMAGE=gcr.io/distroless/java17-debian12 COHERENCE_VERSION=$COH_VERSION PROFILES=,-jakarta,javax,scope make clean generate-proto build-test-images test-e2e-standalone-scope
88+
SKIP_PROTO_GENERATION=true COHERENCE_BASE_IMAGE=gcr.io/distroless/java17-debian12 COHERENCE_VERSION=$COH_VERSION PROFILES=,-jakarta,javax,scope make clean generate-proto build-test-images test-e2e-standalone-scope
8989
9090
- uses: actions/upload-artifact@v4
9191
if: failure()
@@ -106,7 +106,7 @@ jobs:
106106
run: |
107107
echo "Running verify against $COH_VERSION"
108108
go get google.golang.org/grpc/cmd/protoc-gen-go-grpc@v1.3.0
109-
COHERENCE_BASE_IMAGE=gcr.io/distroless/java17-debian12 SECURE=true COHERENCE_IGNORE_INVALID_CERTS=true INCLUDE_LONG_RUNNING=true \
109+
SKIP_PROTO_GENERATION=true COHERENCE_BASE_IMAGE=gcr.io/distroless/java17-debian12 SECURE=true COHERENCE_IGNORE_INVALID_CERTS=true INCLUDE_LONG_RUNNING=true \
110110
COHERENCE_TLS_CERTS_PATH=`pwd`/test/utils/certs/guardians-ca.crt \
111111
COHERENCE_TLS_CLIENT_CERT=`pwd`/test/utils/certs/star-lord.crt \
112112
COHERENCE_TLS_CLIENT_KEY=`pwd`/test/utils/certs/star-lord.key \

‎.github/workflows/build-compatability-v1-1412.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ jobs:
8989
shell: bash
9090
run: |
9191
go get google.golang.org/grpc/cmd/protoc-gen-go-grpc@v1.3.0
92-
COHERENCE_BASE_IMAGE=gcr.io/distroless/java17-debian12 COHERENCE_VERSION=$COH_VERSION PROFILES=,-jakarta,javax,scope make clean generate-proto generate-proto-v1 build-test-images test-e2e-standalone-scope
92+
SKIP_PROTO_GENERATION=true COHERENCE_BASE_IMAGE=gcr.io/distroless/java17-debian12 COHERENCE_VERSION=$COH_VERSION PROFILES=,-jakarta,javax,scope make clean generate-proto generate-proto-v1 build-test-images test-e2e-standalone-scope
9393
9494
- uses: actions/upload-artifact@v4
9595
if: failure()
@@ -104,7 +104,7 @@ jobs:
104104
run: |
105105
echo "Running verify against $COH_VERSION"
106106
go get google.golang.org/grpc/cmd/protoc-gen-go-grpc@v1.3.0
107-
COHERENCE_BASE_IMAGE=gcr.io/distroless/java17-debian12 SECURE=true COHERENCE_IGNORE_INVALID_CERTS=true INCLUDE_LONG_RUNNING=true \
107+
SKIP_PROTO_GENERATION=true COHERENCE_BASE_IMAGE=gcr.io/distroless/java17-debian12 SECURE=true COHERENCE_IGNORE_INVALID_CERTS=true INCLUDE_LONG_RUNNING=true \
108108
COHERENCE_TLS_CERTS_PATH=`pwd`/test/utils/certs/guardians-ca.crt \
109109
COHERENCE_TLS_CLIENT_CERT=`pwd`/test/utils/certs/star-lord.crt \
110110
COHERENCE_TLS_CLIENT_KEY=`pwd`/test/utils/certs/star-lord.key \

‎.github/workflows/build-compatability-v1.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ jobs:
8989
shell: bash
9090
run: |
9191
go get google.golang.org/grpc/cmd/protoc-gen-go-grpc@v1.3.0
92-
COHERENCE_BASE_IMAGE=gcr.io/distroless/java17-debian12 COHERENCE_VERSION=$COH_VERSION PROFILES=,jakarta,-javax,scope make clean generate-proto generate-proto-v1 build-test-images test-e2e-standalone-scope
92+
SKIP_PROTO_GENERATION=true COHERENCE_BASE_IMAGE=gcr.io/distroless/java17-debian12 COHERENCE_VERSION=$COH_VERSION PROFILES=,jakarta,-javax,scope make clean generate-proto generate-proto-v1 build-test-images test-e2e-standalone-scope
9393
9494
- uses: actions/upload-artifact@v4
9595
if: failure()
@@ -104,7 +104,7 @@ jobs:
104104
run: |
105105
echo "Running verify against $COH_VERSION"
106106
go get google.golang.org/grpc/cmd/protoc-gen-go-grpc@v1.3.0
107-
COHERENCE_BASE_IMAGE=gcr.io/distroless/java17-debian12 SECURE=true COHERENCE_IGNORE_INVALID_CERTS=true INCLUDE_LONG_RUNNING=true \
107+
SKIP_PROTO_GENERATION=true COHERENCE_BASE_IMAGE=gcr.io/distroless/java17-debian12 SECURE=true COHERENCE_IGNORE_INVALID_CERTS=true INCLUDE_LONG_RUNNING=true \
108108
COHERENCE_TLS_CERTS_PATH=`pwd`/test/utils/certs/guardians-ca.crt \
109109
COHERENCE_TLS_CLIENT_CERT=`pwd`/test/utils/certs/star-lord.crt \
110110
COHERENCE_TLS_CLIENT_KEY=`pwd`/test/utils/certs/star-lord.key \

‎.github/workflows/build-compatability.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ jobs:
8989
shell: bash
9090
run: |
9191
go get google.golang.org/grpc/cmd/protoc-gen-go-grpc@v1.3.0
92-
COHERENCE_BASE_IMAGE=gcr.io/distroless/java17-debian12 COHERENCE_VERSION=$COH_VERSION PROFILES=,jakarta,-javax,scope make clean generate-proto build-test-images test-e2e-standalone-scope
92+
SKIP_PROTO_GENERATION=true COHERENCE_BASE_IMAGE=gcr.io/distroless/java17-debian12 COHERENCE_VERSION=$COH_VERSION PROFILES=,jakarta,-javax,scope make clean generate-proto build-test-images test-e2e-standalone-scope
9393
9494
- uses: actions/upload-artifact@v4
9595
if: failure()
@@ -104,7 +104,7 @@ jobs:
104104
run: |
105105
echo "Running verify against $COH_VERSION"
106106
go get google.golang.org/grpc/cmd/protoc-gen-go-grpc@v1.3.0
107-
COHERENCE_BASE_IMAGE=gcr.io/distroless/java17-debian12 SECURE=true COHERENCE_IGNORE_INVALID_CERTS=true INCLUDE_LONG_RUNNING=true \
107+
SKIP_PROTO_GENERATION=true COHERENCE_BASE_IMAGE=gcr.io/distroless/java17-debian12 SECURE=true COHERENCE_IGNORE_INVALID_CERTS=true INCLUDE_LONG_RUNNING=true \
108108
COHERENCE_TLS_CERTS_PATH=`pwd`/test/utils/certs/guardians-ca.crt \
109109
COHERENCE_TLS_CLIENT_CERT=`pwd`/test/utils/certs/star-lord.crt \
110110
COHERENCE_TLS_CLIENT_KEY=`pwd`/test/utils/certs/star-lord.key \

‎.github/workflows/build.yaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ jobs:
6868
shell: bash
6969
run: |
7070
go get google.golang.org/grpc/cmd/protoc-gen-go-grpc@v1.3.0
71-
INCLUDE_LONG_RUNNING=true PROFILES=,-jakarta,javax COHERENCE_VERSION=22.06.11 make clean generate-proto build-test-images test-e2e-standalone
71+
INCLUDE_LONG_RUNNING=true PROFILES=,-jakarta,javax COHERENCE_VERSION=22.06.12 make clean generate-proto build-test-images test-e2e-standalone
7272
7373
- name: Profile Near Cache
7474
shell: bash
@@ -85,7 +85,7 @@ jobs:
8585
shell: bash
8686
run: |
8787
go get google.golang.org/grpc/cmd/protoc-gen-go-grpc@v1.3.0
88-
COHERENCE_VERSION=22.06.11 PROFILES=,-jakarta,javax,scope make clean generate-proto build-test-images test-e2e-standalone-scope
88+
SKIP_PROTO_GENERATION=true COHERENCE_VERSION=22.06.11 PROFILES=,-jakarta,javax,scope make clean generate-proto build-test-images test-e2e-standalone-scope
8989
9090
- uses: actions/upload-artifact@v4
9191
if: failure()
@@ -96,7 +96,7 @@ jobs:
9696
- name: E2E Local Tests SSL (env)
9797
shell: bash
9898
run: |
99-
SECURE=env COHERENCE_IGNORE_INVALID_CERTS=true \
99+
SKIP_PROTO_GENERATION=true SECURE=env COHERENCE_IGNORE_INVALID_CERTS=true \
100100
COHERENCE_TLS_CERTS_PATH=`pwd`/test/utils/certs/guardians-ca.crt \
101101
COHERENCE_TLS_CLIENT_CERT=`pwd`/test/utils/certs/star-lord.crt \
102102
COHERENCE_TLS_CLIENT_KEY=`pwd`/test/utils/certs/star-lord.key \
@@ -105,7 +105,7 @@ jobs:
105105
- name: E2E Local Tests SSL (options)
106106
shell: bash
107107
run: |
108-
SECURE=options COHERENCE_IGNORE_INVALID_CERTS_OPTION=true \
108+
SKIP_PROTO_GENERATION=true SECURE=options COHERENCE_IGNORE_INVALID_CERTS_OPTION=true \
109109
COHERENCE_TLS_CERTS_PATH_OPTION=`pwd`/test/utils/certs/guardians-ca.crt \
110110
COHERENCE_TLS_CLIENT_CERT_OPTION=`pwd`/test/utils/certs/star-lord.crt \
111111
COHERENCE_TLS_CLIENT_KEY_OPTION=`pwd`/test/utils/certs/star-lord.key \
@@ -114,7 +114,7 @@ jobs:
114114
- name: E2E Local Tests SSL (tlsConfig)
115115
shell: bash
116116
run: |
117-
SECURE=tlsConfig COHERENCE_IGNORE_INVALID_CERTS_OPTION=true \
117+
SKIP_PROTO_GENERATION=true SECURE=tlsConfig COHERENCE_IGNORE_INVALID_CERTS_OPTION=true \
118118
COHERENCE_TLS_CERTS_PATH_OPTION=`pwd`/test/utils/certs/guardians-ca.crt \
119119
COHERENCE_TLS_CLIENT_CERT_OPTION=`pwd`/test/utils/certs/star-lord.crt \
120120
COHERENCE_TLS_CLIENT_KEY_OPTION=`pwd`/test/utils/certs/star-lord.key \

‎Makefile‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,7 @@ DATE_FMT := "%Y-%m-%dT%H:%M:%SZ"
9898
BUILD_DATE := $(shell date -u -d "@$SOURCE_DATE_EPOCH" "+${DATE_FMT}" 2>/dev/null || date -u -r "${SOURCE_DATE_EPOCH}" "+${DATE_FMT}" 2>/dev/null || date -u "+${DATE_FMT}")
9999
BUILD_USER := $(shell whoami)
100100
GOS = $(shell find . -type f -name "*.go" ! -name "*_test.go")
101+
SKIP_PROTO_GENERATION ?= false
101102

102103
# ======================================================================================================================
103104
# Makefile targets start here
@@ -213,6 +214,9 @@ golangci: $(TOOLS_BIN)/golangci-lint ## Go code review
213214
# ----------------------------------------------------------------------------------------------------------------------
214215
.PHONY: generate-proto
215216
generate-proto: $(TOOLS_BIN)/protoc ## Generate Proto Files
217+
ifeq ($(SKIP_PROTO_GENERATION),true)
218+
@echo "Skipping proto generation..."
219+
else
216220
curl $(CURL_AUTH) -s https://api.github.com/rate_limit | jq '.rate'
217221
mkdir -p $(PROTO_DIR) || true
218222
curl $(CURL_AUTH) -o $(PROTO_DIR)/services.proto https://raw.githubusercontent.com/oracle/coherence/22.06.12/prj/coherence-grpc/src/main/proto/services.proto
@@ -222,12 +226,16 @@ generate-proto: $(TOOLS_BIN)/protoc ## Generate Proto Files
222226
echo 'option go_package = "github.com/oracle/coherence-go-client/proto";' >> $(PROTO_DIR)/services.proto
223227
echo 'option go_package = "github.com/oracle/coherence-go-client/proto";' >> $(PROTO_DIR)/messages.proto
224228
$(TOOLS_BIN)/protoc --proto_path=./etc/proto --go_out=./proto --go_opt=paths=source_relative --go-grpc_out=./proto --go-grpc_opt=paths=source_relative etc/proto/messages.proto etc/proto/services.proto
229+
endif
225230

226231
# ----------------------------------------------------------------------------------------------------------------------
227232
# Download and build proto files - v1
228233
# ----------------------------------------------------------------------------------------------------------------------
229234
.PHONY: generate-proto-v1
230235
generate-proto-v1: $(TOOLS_BIN)/protoc ## Generate Proto Files v1
236+
ifeq ($(SKIP_PROTO_GENERATION),true)
237+
@echo "Skipping proto generation..."
238+
else
231239
curl $(CURL_AUTH) -s https://api.github.com/rate_limit | jq '.rate'
232240
mkdir -p $(PROTOV1_DIR) || true
233241
curl $(CURL_AUTH) -o $(PROTOV1_DIR)/proxy_service_messages_v1.proto https://raw.githubusercontent.com/oracle/coherence/25.03.1/prj/coherence-grpc/src/main/proto/proxy_service_messages_v1.proto
@@ -247,7 +255,7 @@ generate-proto-v1: $(TOOLS_BIN)/protoc ## Generate Proto Files v1
247255
echo 'option go_package = "github.com/oracle/coherence-go-client/proto/v1";' >> $(PROTOV1_DIR)/queue_service_messages_v1.proto
248256
mkdir ./proto/v1 || true
249257
$(TOOLS_BIN)/protoc --proto_path=./etc/proto-v1 --go_out=./proto/v1 --go_opt=paths=source_relative --go-grpc_out=./proto/v1 --go-grpc_opt=paths=source_relative etc/proto-v1/proxy_service_messages_v1.proto etc/proto-v1/proxy_service_v1.proto etc/proto-v1/common_messages_v1.proto etc/proto-v1/cache_service_messages_v1.proto etc/proto-v1/queue_service_messages_v1.proto
250-
258+
endif
251259

252260
# ----------------------------------------------------------------------------------------------------------------------
253261
# Show the local documentation

0 commit comments

Comments
 (0)