From 37cc4d7caf18d4eaf29b5273a85bb1ef09d4f195 Mon Sep 17 00:00:00 2001 From: michaelbausor Date: Thu, 6 Jul 2017 16:23:55 -0700 Subject: [PATCH] Update artman config for php (#389) --- gapic/api/artman_bigtable.yaml | 2 ++ gapic/api/artman_bigtable_admin.yaml | 2 ++ gapic/api/artman_clouddebugger.yaml | 2 ++ gapic/api/artman_datastore.yaml | 2 ++ gapic/api/artman_errorreporting.yaml | 2 ++ gapic/api/artman_functions.yaml | 3 ++- gapic/api/artman_iam.yaml | 10 ++++++++++ gapic/api/artman_language_v1.yaml | 2 ++ gapic/api/artman_language_v1beta2.yaml | 2 ++ gapic/api/artman_logging.yaml | 2 ++ gapic/api/artman_longrunning.yaml | 7 +++++++ gapic/api/artman_monitoring.yaml | 2 ++ gapic/api/artman_pubsub.yaml | 2 ++ gapic/api/artman_spanner.yaml | 2 ++ gapic/api/artman_spanner_admin_database.yaml | 2 ++ gapic/api/artman_spanner_admin_instance.yaml | 2 ++ gapic/api/artman_speech_v1.yaml | 2 ++ gapic/api/artman_speech_v1beta1.yaml | 2 ++ gapic/api/artman_trace.yaml | 2 ++ gapic/api/artman_videointelligence.yaml | 4 +++- gapic/api/artman_vision.yaml | 2 ++ gapic/core/artman_core.yaml | 7 +++++-- gapic/core/artman_iam.yaml | 7 +++++-- gapic/packaging/dependencies.yaml | 6 +++--- 24 files changed, 69 insertions(+), 9 deletions(-) diff --git a/gapic/api/artman_bigtable.yaml b/gapic/api/artman_bigtable.yaml index 29308112..4d51295e 100644 --- a/gapic/api/artman_bigtable.yaml +++ b/gapic/api/artman_bigtable.yaml @@ -59,6 +59,8 @@ php: staging: paths: - generated/php/google-cloud-bigtable-v2 + - artifact: grpc + dest: generated/php/google-cloud-bigtable-v2/proto python: gapic_code_dir: ${REPOROOT}/artman/output/gapic-google-cloud-bigtable-v2 git_repos: diff --git a/gapic/api/artman_bigtable_admin.yaml b/gapic/api/artman_bigtable_admin.yaml index d1db4804..4b7b40ae 100644 --- a/gapic/api/artman_bigtable_admin.yaml +++ b/gapic/api/artman_bigtable_admin.yaml @@ -59,6 +59,8 @@ php: staging: paths: - generated/php/google-cloud-bigtable-admin-v2 + - artifact: grpc + dest: generated/php/google-cloud-bigtable-admin-v2/proto python: gapic_code_dir: ${REPOROOT}/artman/output/gapic-google-cloud-bigtable-admin-v2 git_repos: diff --git a/gapic/api/artman_clouddebugger.yaml b/gapic/api/artman_clouddebugger.yaml index 8266d3dc..cbac46d9 100644 --- a/gapic/api/artman_clouddebugger.yaml +++ b/gapic/api/artman_clouddebugger.yaml @@ -61,6 +61,8 @@ php: staging: paths: - generated/php/google-cloud-debugger-v2 + - artifact: grpc + dest: generated/php/google-cloud-debugger-v2/proto python: gapic_code_dir: ${REPOROOT}/artman/output/gapic-google-cloud-debugger-v2 git_repos: diff --git a/gapic/api/artman_datastore.yaml b/gapic/api/artman_datastore.yaml index 6f961c75..15a8120e 100644 --- a/gapic/api/artman_datastore.yaml +++ b/gapic/api/artman_datastore.yaml @@ -59,6 +59,8 @@ php: staging: paths: - generated/php/google-cloud-datastore-v1 + - artifact: grpc + dest: generated/php/google-cloud-datastore-v1/proto python: release_level: beta generated_package_version: diff --git a/gapic/api/artman_errorreporting.yaml b/gapic/api/artman_errorreporting.yaml index 3c9d1109..415569f7 100644 --- a/gapic/api/artman_errorreporting.yaml +++ b/gapic/api/artman_errorreporting.yaml @@ -62,6 +62,8 @@ php: staging: paths: - generated/php/google-cloud-error-reporting-v1beta1 + - artifact: grpc + dest: generated/php/google-cloud-error-reporting-v1beta1/proto python: gapic_code_dir: ${REPOROOT}/artman/output/gapic-google-cloud-error-reporting-v1beta1 git_repos: diff --git a/gapic/api/artman_functions.yaml b/gapic/api/artman_functions.yaml index b6889302..1a99ad43 100644 --- a/gapic/api/artman_functions.yaml +++ b/gapic/api/artman_functions.yaml @@ -59,7 +59,8 @@ php: staging: paths: - generated/php/google-cloud-functions-v1beta2 - enable_batch_generation: True + - artifact: grpc + dest: generated/php/google-cloud-functions-v1beta2/proto python: gapic_code_dir: ${REPOROOT}/artman/output/gapic-google-cloud-functions-v1beta2 git_repos: diff --git a/gapic/api/artman_iam.yaml b/gapic/api/artman_iam.yaml index 58eefb88..472a8897 100644 --- a/gapic/api/artman_iam.yaml +++ b/gapic/api/artman_iam.yaml @@ -21,6 +21,10 @@ common: enable_batch_generation: False java: gapic_code_dir: ${REPOROOT}/artman/output/java/google-cloud-iam + git_repos: + staging: + paths: + - generated/java/google-cloud-iam-v1 python: gapic_code_dir: ${REPOROOT}/artman/output/gcloud-python-iam go: @@ -38,6 +42,12 @@ csharp: gapic_code_dir: ${REPOROOT}/artman/output/csharp/google-cloud-iam php: gapic_code_dir: ${REPOROOT}/artman/output/gcloud-php-iam + git_repos: + staging: + paths: + - generated/php/google-iam-admin-v1 + - artifact: grpc + dest: generated/php/google-iam-admin-v1/proto ruby: gapic_code_dir: ${REPOROOT}/google-cloud-ruby/google-cloud-iam nodejs: diff --git a/gapic/api/artman_language_v1.yaml b/gapic/api/artman_language_v1.yaml index f7d21f6a..15273548 100644 --- a/gapic/api/artman_language_v1.yaml +++ b/gapic/api/artman_language_v1.yaml @@ -65,6 +65,8 @@ php: staging: paths: - generated/php/google-cloud-language-v1 + - artifact: grpc + dest: generated/php/google-cloud-language-v1/proto python: gapic_code_dir: ${REPOROOT}/artman/output/gapic-google-cloud-language-v1 git_repos: diff --git a/gapic/api/artman_language_v1beta2.yaml b/gapic/api/artman_language_v1beta2.yaml index adf88aff..89a8c388 100644 --- a/gapic/api/artman_language_v1beta2.yaml +++ b/gapic/api/artman_language_v1beta2.yaml @@ -65,6 +65,8 @@ php: staging: paths: - generated/php/google-cloud-language-v1beta2 + - artifact: grpc + dest: generated/php/google-cloud-language-v1beta2/proto python: gapic_code_dir: ${REPOROOT}/artman/output/gapic-google-cloud-language-v1beta2 git_repos: diff --git a/gapic/api/artman_logging.yaml b/gapic/api/artman_logging.yaml index 476f9804..36da8a58 100644 --- a/gapic/api/artman_logging.yaml +++ b/gapic/api/artman_logging.yaml @@ -63,6 +63,8 @@ php: staging: paths: - generated/php/google-cloud-logging-v2 + - artifact: grpc + dest: generated/php/google-cloud-logging-v2/proto python: release_level: beta generated_package_version: diff --git a/gapic/api/artman_longrunning.yaml b/gapic/api/artman_longrunning.yaml index 718830af..eb910abb 100644 --- a/gapic/api/artman_longrunning.yaml +++ b/gapic/api/artman_longrunning.yaml @@ -59,6 +59,13 @@ php: staging: paths: - generated/php/google-longrunning-v1 + - artifact: grpc + dest: generated/php/google-longrunning-v1/proto + gax: + location: git@github.com:googleapis/gax-php.git + paths: + - src: src/Longrunning + dest: src/Longrunning python: gapic_code_dir: ${REPOROOT}/artman/output/gax-python git_repos: diff --git a/gapic/api/artman_monitoring.yaml b/gapic/api/artman_monitoring.yaml index ef430d83..fd70d092 100644 --- a/gapic/api/artman_monitoring.yaml +++ b/gapic/api/artman_monitoring.yaml @@ -65,6 +65,8 @@ php: staging: paths: - generated/php/google-cloud-monitoring-v3 + - artifact: grpc + dest: generated/php/google-cloud-monitoring-v3/proto python: gapic_code_dir: ${REPOROOT}/artman/output/gapic-google-cloud-monitoring-v3 git_repos: diff --git a/gapic/api/artman_pubsub.yaml b/gapic/api/artman_pubsub.yaml index 77adea83..55c2795b 100644 --- a/gapic/api/artman_pubsub.yaml +++ b/gapic/api/artman_pubsub.yaml @@ -67,6 +67,8 @@ php: staging: paths: - generated/php/google-cloud-pubsub-v1 + - artifact: grpc + dest: generated/php/google-cloud-pubsub-v1/proto python: gapic_code_dir: ${REPOROOT}/artman/output/gapic-google-cloud-pubsub-v1 git_repos: diff --git a/gapic/api/artman_spanner.yaml b/gapic/api/artman_spanner.yaml index 9ee8795b..b91f0d40 100644 --- a/gapic/api/artman_spanner.yaml +++ b/gapic/api/artman_spanner.yaml @@ -63,6 +63,8 @@ php: staging: paths: - generated/php/google-cloud-spanner-v1 + - artifact: grpc + dest: generated/php/google-cloud-spanner-v1/proto python: gapic_code_dir: ${REPOROOT}/artman/output/gapic-google-cloud-spanner-v1 git_repos: diff --git a/gapic/api/artman_spanner_admin_database.yaml b/gapic/api/artman_spanner_admin_database.yaml index 90de09c5..aa57d850 100644 --- a/gapic/api/artman_spanner_admin_database.yaml +++ b/gapic/api/artman_spanner_admin_database.yaml @@ -60,6 +60,8 @@ php: staging: paths: - generated/php/google-cloud-spanner-admin-database-v1 + - artifact: grpc + dest: generated/php/google-cloud-spanner-admin-database-v1/proto python: gapic_code_dir: ${REPOROOT}/artman/output/gapic-google-cloud-spanner-admin-database-v1 git_repos: diff --git a/gapic/api/artman_spanner_admin_instance.yaml b/gapic/api/artman_spanner_admin_instance.yaml index 071c022e..8ea93045 100644 --- a/gapic/api/artman_spanner_admin_instance.yaml +++ b/gapic/api/artman_spanner_admin_instance.yaml @@ -60,6 +60,8 @@ php: staging: paths: - generated/php/google-cloud-spanner-admin-instance-v1 + - artifact: grpc + dest: generated/php/google-cloud-spanner-admin-instance-v1/proto python: gapic_code_dir: ${REPOROOT}/artman/output/gapic-google-cloud-spanner-admin-instance-v1 git_repos: diff --git a/gapic/api/artman_speech_v1.yaml b/gapic/api/artman_speech_v1.yaml index f2d7affb..290e9283 100644 --- a/gapic/api/artman_speech_v1.yaml +++ b/gapic/api/artman_speech_v1.yaml @@ -65,6 +65,8 @@ php: staging: paths: - generated/php/google-cloud-speech-v1 + - artifact: grpc + dest: generated/php/google-cloud-speech-v1/proto python: gapic_code_dir: ${REPOROOT}/artman/output/gapic-google-cloud-speech-v1 git_repos: diff --git a/gapic/api/artman_speech_v1beta1.yaml b/gapic/api/artman_speech_v1beta1.yaml index 523ad8f9..df399c60 100644 --- a/gapic/api/artman_speech_v1beta1.yaml +++ b/gapic/api/artman_speech_v1beta1.yaml @@ -55,6 +55,8 @@ php: staging: paths: - generated/php/google-cloud-speech-v1beta1 + - artifact: grpc + dest: generated/php/google-cloud-speech-v1beta1/proto python: gapic_code_dir: ${REPOROOT}/artman/output/gapic-google-cloud-speech-v1beta1 git_repos: diff --git a/gapic/api/artman_trace.yaml b/gapic/api/artman_trace.yaml index adc94d59..5fdf53c8 100644 --- a/gapic/api/artman_trace.yaml +++ b/gapic/api/artman_trace.yaml @@ -61,6 +61,8 @@ php: staging: paths: - generated/php/google-cloud-trace-v1 + - artifact: grpc + dest: generated/php/google-cloud-trace-v1/proto python: gapic_code_dir: ${REPOROOT}/artman/output/gapic-google-cloud-trace-v1 git_repos: diff --git a/gapic/api/artman_videointelligence.yaml b/gapic/api/artman_videointelligence.yaml index 85133d0d..718ac004 100644 --- a/gapic/api/artman_videointelligence.yaml +++ b/gapic/api/artman_videointelligence.yaml @@ -67,7 +67,9 @@ php: git_repos: staging: paths: - - dest: generated/php/google-cloud-video-intelligence-v1beta1 + - generated/php/google-cloud-video-intelligence-v1beta1 + - artifact: grpc + dest: generated/php/google-cloud-video-intelligence-v1beta1/proto enable_batch_generation: True python: gapic_code_dir: ${REPOROOT}/artman/output/gapic-google-cloud-video-intelligence-v1beta1 diff --git a/gapic/api/artman_vision.yaml b/gapic/api/artman_vision.yaml index 04dbb09b..c874cf50 100644 --- a/gapic/api/artman_vision.yaml +++ b/gapic/api/artman_vision.yaml @@ -67,6 +67,8 @@ php: staging: paths: - generated/php/google-cloud-vision-v1 + - artifact: grpc + dest: generated/php/google-cloud-vision-v1/proto python: release_level: beta generated_package_version: diff --git a/gapic/core/artman_core.yaml b/gapic/core/artman_core.yaml index c9eb6524..366dc86a 100644 --- a/gapic/core/artman_core.yaml +++ b/gapic/core/artman_core.yaml @@ -32,7 +32,10 @@ java: - artifact: grpc dest: generated/java/grpc-google-common-protos php: - enable_batch_generation: false - + git_repos: + staging: + paths: + - artifact: grpc + dest: generated/php/proto-google-common-protos go: enable_batch_generation: false diff --git a/gapic/core/artman_iam.yaml b/gapic/core/artman_iam.yaml index f17d90b5..ffd8546f 100644 --- a/gapic/core/artman_iam.yaml +++ b/gapic/core/artman_iam.yaml @@ -25,7 +25,10 @@ java: - artifact: proto dest: generated/java/proto-google-iam-v1 php: - enable_batch_generation: false - + git_repos: + staging: + paths: + - artifact: grpc + dest: generated/php/proto-google-iam-v1 go: enable_batch_generation: false diff --git a/gapic/packaging/dependencies.yaml b/gapic/packaging/dependencies.yaml index 9e432f35..50ee9458 100644 --- a/gapic/packaging/dependencies.yaml +++ b/gapic/packaging/dependencies.yaml @@ -32,7 +32,7 @@ grpc_version: nodejs: lower: '1.1.2' php: - lower: '0.14.1' + lower: '1.4.0' ruby: lower: '1.0' java: @@ -45,7 +45,7 @@ gax_version: nodejs: lower: '0.13.2' php: - lower: '0.8.*' + lower: '0.20.0' ruby: lower: '0.8.4' java: @@ -63,7 +63,7 @@ proto_version: # This is the version of ProtoBuf.js. lower: '5.0.1' php: - lower: '0.9.*' + lower: '3.3.2' ruby: lower: '3.0' java: