From 836ddbc463f970e1740f24ade2732561b9ae1b58 Mon Sep 17 00:00:00 2001 From: Mira Leung Date: Fri, 9 Oct 2020 14:46:54 -0700 Subject: [PATCH 1/3] build: fix CircleCI test results directory --- .circleci/config.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 5a5afd7c9d..e3e40f42cb 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -28,6 +28,7 @@ jobs: name: Make reports directory command: | mkdir -p ${TEST_REPORTS_DIR} + echo "Test report directory: ${TEST_REPORTS_DIR}" - run: name: Build targets for gapic-generator-java command: | @@ -40,9 +41,9 @@ jobs: bazel --batch test //... --noshow_progress find . -type f -regex ".*/bazel-testlogs/.*xml" -exec cp {} ${TEST_REPORTS_DIR} \; - store_test_results: - path: bazel/reports/gapic-generator-java + path: /tmp/workspace/bazel/reports/gapic-generator-java - store_artifacts: - path: bazel/reports/gapic-generator-java + path: /tmp/workspace/bazel/reports/gapic-generator-java google-java-format: docker: - image: l.gcr.io/google/bazel From 24aa38f20537dd3d25c5a82cd33c6c4bc9792333 Mon Sep 17 00:00:00 2001 From: Mira Leung Date: Fri, 9 Oct 2020 14:48:36 -0700 Subject: [PATCH 2/3] fix: use a valid test reports path --- .circleci/config.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index e3e40f42cb..90514add1a 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -5,7 +5,7 @@ jobs: gapic-generator-java-tests: working_directory: /tmp/ environment: - TEST_REPORTS_DIR: /tmp/workspace/bazel/reports/gapic-generator-java + TEST_REPORTS_DIR: ~/.cache/bazel BAZEL_VERSION: 3.5.1 PYTHON_VERSION: 3.5.2 machine: true @@ -28,7 +28,7 @@ jobs: name: Make reports directory command: | mkdir -p ${TEST_REPORTS_DIR} - echo "Test report directory: ${TEST_REPORTS_DIR}" + echo "Test reports stored in: ${TEST_REPORTS_DIR}" - run: name: Build targets for gapic-generator-java command: | @@ -41,9 +41,9 @@ jobs: bazel --batch test //... --noshow_progress find . -type f -regex ".*/bazel-testlogs/.*xml" -exec cp {} ${TEST_REPORTS_DIR} \; - store_test_results: - path: /tmp/workspace/bazel/reports/gapic-generator-java + path: ~/.cache/bazel - store_artifacts: - path: /tmp/workspace/bazel/reports/gapic-generator-java + path: ~/.cache/bazel google-java-format: docker: - image: l.gcr.io/google/bazel From 0f8c235acfbc0f7b42886bfbcabb81f997f9c589 Mon Sep 17 00:00:00 2001 From: Mira Leung Date: Fri, 9 Oct 2020 17:35:20 -0700 Subject: [PATCH 3/3] fix: remove store_artifacts to speed up runs --- .circleci/config.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 90514add1a..9d9dc16355 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -42,8 +42,6 @@ jobs: find . -type f -regex ".*/bazel-testlogs/.*xml" -exec cp {} ${TEST_REPORTS_DIR} \; - store_test_results: path: ~/.cache/bazel - - store_artifacts: - path: ~/.cache/bazel google-java-format: docker: - image: l.gcr.io/google/bazel