From 2042e6a1f4d5a11fa054cd0d336c546e3a9cbade Mon Sep 17 00:00:00 2001 From: Andrea Lin Date: Thu, 6 Sep 2018 14:05:15 -0700 Subject: [PATCH 1/4] skip tests on javadoc, don't build --- .circleci/config.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 0e582dc9c96b..c0638bdb993f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -238,11 +238,9 @@ jobs: <<: *anchor_docker steps: - checkout - - run: - <<: *anchor_build - run: name: Run mvn javadoc goal - command: mvn javadoc:javadoc javadoc:test-javadoc + command: mvn javadoc:javadoc javadoc:test-javadoc -DskipTests workflows: version: 2 From b56f66136b411ba3aacde3bc089295683a5073be Mon Sep 17 00:00:00 2001 From: Andrea Lin Date: Thu, 6 Sep 2018 14:43:14 -0700 Subject: [PATCH 2/4] only run javadoc goal --- .circleci/config.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index c0638bdb993f..5152a6b3c40d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -11,8 +11,6 @@ anchor_unittest: &anchor_unittest anchor_docker: &anchor_docker docker: - image: circleci/openjdk:8-jdk - environment: - TERM: dumb anchor_auth_vars: &anchor_auth_vars environment: @@ -234,13 +232,13 @@ jobs: name: Run integration tests for google-cloud-translate command: ./utilities/verify_single_it.sh google-cloud-clients/google-cloud-translate javadoc_test: - working_directory: ~/googleapis + working_directory: /tmp/ <<: *anchor_docker steps: - checkout - run: name: Run mvn javadoc goal - command: mvn javadoc:javadoc javadoc:test-javadoc -DskipTests + command: mvn javadoc:javadoc -DskipTests workflows: version: 2 From c4f5ba35971b0e3e1137822fb6b0b9236e93d6b9 Mon Sep 17 00:00:00 2001 From: Andrea Lin Date: Thu, 6 Sep 2018 14:50:25 -0700 Subject: [PATCH 3/4] revert workspace location --- .circleci/config.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 5152a6b3c40d..d44de6dfbf31 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -11,6 +11,8 @@ anchor_unittest: &anchor_unittest anchor_docker: &anchor_docker docker: - image: circleci/openjdk:8-jdk + environment: + TERM: dumb anchor_auth_vars: &anchor_auth_vars environment: @@ -232,7 +234,7 @@ jobs: name: Run integration tests for google-cloud-translate command: ./utilities/verify_single_it.sh google-cloud-clients/google-cloud-translate javadoc_test: - working_directory: /tmp/ + working_directory: ~/googleapis <<: *anchor_docker steps: - checkout From 48499992bc96a0a3898656ab89469cdc1b00fe05 Mon Sep 17 00:00:00 2001 From: Andrea Lin Date: Thu, 6 Sep 2018 15:10:08 -0700 Subject: [PATCH 4/4] readd mvn build step --- .circleci/config.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index d44de6dfbf31..8cf3d9fff6c5 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -238,6 +238,8 @@ jobs: <<: *anchor_docker steps: - checkout + - run: + <<: *anchor_build - run: name: Run mvn javadoc goal command: mvn javadoc:javadoc -DskipTests