Merge pull request #429 from mattcary/cloudbuild

Tweak make rules to make cloudbuild work
kubernetes-csi · Mar 12, 2022 · fee2439 · fee2439
2 parents a65891c + 6bda62a
commit fee2439
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/Makefile b/Makefile
@@ -65,6 +65,12 @@ update:
 	hack/update-dependencies.sh
 	hack/verify-update.sh
 
+# There seems to be some shell quoting problem with cloudbuild.yaml, and trying
+# to pass multiple make targets appears as a single quoted string. See
+# cloudbuild.yaml for how this is used.
+.PHONY: cloudbuild
+cloudbuild: container-all push-manifest push-latest
+
 .PHONY: verify
 verify: unit-test
 	hack/verify-all.sh

diff --git a/cloudbuild.yaml b/cloudbuild.yaml
@@ -17,7 +17,7 @@ steps:
     # set the home to /root explicitly to if using docker buildx
     - HOME=/root
     args:
-      - container-all push-manifest push-latest
+      - cloudbuild
 
 substitutions:
   _STAGING_PROJECT: 'k8s-staging-cloud-provider-gcp'