From b525fb6acacba3ce7f82bf08428f0ccf474d6fec Mon Sep 17 00:00:00 2001
From: Victor Chudnovsky <vchudnov@google.com>
Date: Thu, 31 Oct 2019 15:27:39 -0700
Subject: [PATCH] Try to debug CircleCI

---
 .circleci/config.yml | 9 +++++++--
 generate_clients.py  | 6 +++---
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 5d85b9f76b..63c86fde59 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -115,7 +115,8 @@ anchor_test_ruby_client: &anchor_test_ruby_client
       bundle update
       bundle exec rake test
     else
-      echo "Ruby ${TEST_API} library was not generated."
+      echo "Ruby ${TEST_API} library was not generated for ${LANGUAGE} at ${RUBY_GEN_DIR}."
+      ls -la ${RUBY_GEN_DIR}
       exit 1
     fi
   when: always
@@ -133,6 +134,10 @@ anchor_run_ruby: &anchor_run_ruby
     - attach_workspace:
         # Use the workspace created in generate-clients
         at: workspace
+    - run:
+        name: Prepare environment # The environemnt set for this job does not seem to propagate
+        command: |
+          echo 'export RUBY_GEN_DIR="/tmp/workspace/gapic-generator/artman-genfiles/ruby/google-cloud-ruby/"' >> $BASH_ENV
     - run:
         <<: *anchor_run_decrypt
     - run:
@@ -397,7 +402,7 @@ jobs:
           command: |
             mkdir -p /tmp/workspace/reports/gapic-generator
             cd gapic-generator
-            ./gradlew check
+            ./gradlew --info check
             bash <(curl -s https://codecov.io/bash)
             find -type f -regex ".*/build/test-results/.*xml" | xargs cp -t /tmp/workspace/reports/gapic-generator
           when: always
diff --git a/generate_clients.py b/generate_clients.py
index ef87942125..c375fd9a3f 100644
--- a/generate_clients.py
+++ b/generate_clients.py
@@ -88,7 +88,7 @@ def generate_clients(root_dir, languages, artman_config, log_dir, user_config):
     else:
         logger.info("All passed.")
 
-    return success
+    return success, failure
 
 
 def _generate_artifact(artman_config, artifact_name, root_dir, log_file, user_config_file):
@@ -161,10 +161,10 @@ def _setup_logger(log_file):
     log_dir = os.path.abspath(flags.log_dir)
     user_config = os.path.abspath(os.path.expanduser(flags.user_config)) if flags.user_config else None
 
-    successes = generate_clients(root_dir, flags.languages, flags.artman_config, log_dir, user_config)
+    successes, failures = generate_clients(root_dir, flags.languages, flags.artman_config, log_dir, user_config)
 
     # Exit with success if there were any successful generations.
-    if successes:
+    if not failures:
         sys.exit(0)
     else:
         sys.exit('Client generation failed.')