From 7269e4743dfacb015774d6284ab61dfa1c5f89f8 Mon Sep 17 00:00:00 2001
From: Koichi Shiraishi <zchee.io@gmail.com>
Date: Sun, 4 Apr 2021 10:50:53 +0900
Subject: [PATCH] cloudbuild: update protoc version to v3.15.4 (#9)

* cloudbuild: update protoc version to v3.15.4

- https://github.com/protocolbuffers/protobuf/releases/tag/v3.15.4

* cloudbuild: sort flags and add --log-timestamp flag
---
 README.md       |  1 +
 cloudbuild.yaml | 14 +++++++++-----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index affa83a..620809d 100644
--- a/README.md
+++ b/README.md
@@ -14,6 +14,7 @@ Supported:
 - [v3.15.1](https://github.com/protocolbuffers/protobuf/releases/v3.15.1)
 - [v3.15.2](https://github.com/protocolbuffers/protobuf/releases/v3.15.2)
 - [v3.15.3](https://github.com/protocolbuffers/protobuf/releases/v3.15.3)
+- [v3.15.4](https://github.com/protocolbuffers/protobuf/releases/v3.15.4)
 
 See also [protocolbuffers/protobuf/releases][protocolbuffers/protobuf/releases].
 
diff --git a/cloudbuild.yaml b/cloudbuild.yaml
index fc53fd3..d1fd551 100644
--- a/cloudbuild.yaml
+++ b/cloudbuild.yaml
@@ -9,9 +9,10 @@ steps:
       - --dockerfile=Dockerfile
       - --context=dir:///workspace
       - --reproducible
+      - --log-timestamp
       - --skip-unused-stages=true
-      - --use-new-run
       - --target=protoc
+      - --use-new-run
       - --build-arg=PROTOC_VERSION=${_PROTOC_VERSION}
       - --build-arg=GOLANG_VERSION=${_GOLANG_VERSION}
       - --build-arg=ALPINE_VERSION=${_ALPINE_VERSION}
@@ -27,9 +28,10 @@ steps:
       - --dockerfile=Dockerfile
       - --context=dir:///workspace
       - --reproducible
+      - --log-timestamp
       - --skip-unused-stages=true
-      - --use-new-run
       - --target=protoc-debug
+      - --use-new-run
       - --build-arg=PROTOC_VERSION=${_PROTOC_VERSION}
       - --build-arg=GOLANG_VERSION=${_GOLANG_VERSION}
       - --build-arg=ALPINE_VERSION=${_ALPINE_VERSION}
@@ -46,9 +48,10 @@ steps:
       - --dockerfile=Dockerfile
       - --context=dir:///workspace
       - --reproducible
+      - --log-timestamp
       - --skip-unused-stages=true
-      - --use-new-run
       - --target=golang
+      - --use-new-run
       - --build-arg=PROTOC_VERSION=${_PROTOC_VERSION}
       - --build-arg=GOLANG_VERSION=${_GOLANG_VERSION}
       - --build-arg=ALPINE_VERSION=${_ALPINE_VERSION}
@@ -68,9 +71,10 @@ steps:
       - --dockerfile=Dockerfile
       - --context=dir:///workspace
       - --reproducible
+      - --log-timestamp
       - --skip-unused-stages=true
-      - --use-new-run
       - --target=golang-debug
+      - --use-new-run
       - --build-arg=PROTOC_VERSION=${_PROTOC_VERSION}
       - --build-arg=GOLANG_VERSION=${_GOLANG_VERSION}
       - --build-arg=ALPINE_VERSION=${_ALPINE_VERSION}
@@ -80,7 +84,7 @@ steps:
       - protoc-debug
 
 substitutions:
-  _PROTOC_VERSION: "3.15.3"
+  _PROTOC_VERSION: "3.15.4"
   _GOLANG_VERSION: "1.16"
   _ALPINE_VERSION: "3.13"
   _PROTOC_GEN_GO_VERSION: "v1.25.0"