From 25f6e8de8310ef50e3f8fc1cade3d330d2061df3 Mon Sep 17 00:00:00 2001
From: Mira Leung <miraleung@google.com>
Date: Mon, 18 May 2020 20:36:25 +0000
Subject: [PATCH 1/4] [ggj][ci] Add builder and linter checks

---
 .circleci/config.yml | 42 ++++++++++++++++++++++++++++++++----------
 1 file changed, 32 insertions(+), 10 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 01c267cc21..1eaaef0b5e 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,13 +1,35 @@
-# Use the latest 2.1 version of CircleCI pipeline process engine. See: https://circleci.com/docs/2.0/configuration-reference
 version: 2.1
-# Use a package of configuration called an orb.
-orbs:
-  # Declare a dependency on the welcome-orb
-  welcome: circleci/welcome-orb@0.4.1
-# Orchestrate or schedule a set of jobs
+
+# ======================= JOBS =======================
+jobs:
+  gapic-generator-java-tests:
+    docker:
+      - image: l.gcr.io/google/bazel
+    working_directory: /home/circleci/project/gapic-generator-java
+    steps:
+      - checkout
+      - run:
+          name: Builder
+          command: |
+            bazel build //...
+  google-java-format:
+    docker:
+      - image: l.gcr.io/google/bazel
+    steps:
+      - attach_workspace:
+          at: /home/circleci/workspace
+      - run:
+          name: Java Linter
+          command: |
+            bazel run //:google_java_format_verification
+
+# ======================= WORKFLOWS =======================
+
 workflows:
-  # Name the workflow "welcome"
-  welcome:
-    # Run the welcome/run job in its own container
+  version: 2
+  run_tests:
     jobs:
-      - welcome/run
\ No newline at end of file
+      - gapic-generator-java-tests
+      - google-java-format:
+          requires:
+            - gapic-generator-java-tests

From 797993a8b36cdf0fcc38b277bbadf5468782ca36 Mon Sep 17 00:00:00 2001
From: Mira Leung <miraleung@google.com>
Date: Mon, 18 May 2020 20:52:34 +0000
Subject: [PATCH 2/4] [ggj][ci] Fix google-java-format-verification

---
 .circleci/config.yml | 2 +-
 BUILD.bazel          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 1eaaef0b5e..1c4976719d 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -21,7 +21,7 @@ jobs:
       - run:
           name: Java Linter
           command: |
-            bazel run //:google_java_format_verification
+            bazel build //:google_java_format_verification
 
 # ======================= WORKFLOWS =======================
 
diff --git a/BUILD.bazel b/BUILD.bazel
index 8007569fb1..62b962edce 100644
--- a/BUILD.bazel
+++ b/BUILD.bazel
@@ -30,7 +30,7 @@ java_binary(
 # are formatted correctly.
 google_java_format_verification(
     name = "google_java_format_verification",
-    srcs = glob(["src/**/*.java"]),
+    srcs = ["//src/main/java/com/google/api/generator:generator_files"],
     formatter = "//:google_java_format_binary",
 )
 

From ad8b07d1001dd00b4f3770f14d88ede71d791b72 Mon Sep 17 00:00:00 2001
From: Mira Leung <miraleung@google.com>
Date: Mon, 18 May 2020 21:02:10 +0000
Subject: [PATCH 3/4] [ggj][ci] Fix circleci linter configuration

---
 .circleci/config.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 1c4976719d..af8bce40a9 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -20,6 +20,7 @@ jobs:
           at: /home/circleci/workspace
       - run:
           name: Java Linter
+          working_directory: /home/circleci/workspace/gapic-generator-java
           command: |
             bazel build //:google_java_format_verification
 

From ee85964b1416c613e40cd48609ec86b22859f1dd Mon Sep 17 00:00:00 2001
From: Mira Leung <miraleung@google.com>
Date: Mon, 18 May 2020 21:12:07 +0000
Subject: [PATCH 4/4] [ggj][ci] Fix circleci linter configuration

---
 .circleci/config.yml | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index af8bce40a9..d86790845a 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -15,12 +15,11 @@ jobs:
   google-java-format:
     docker:
       - image: l.gcr.io/google/bazel
+    working_directory: /home/circleci/workspace/gapic-generator-java
     steps:
-      - attach_workspace:
-          at: /home/circleci/workspace
+      - checkout
       - run:
           name: Java Linter
-          working_directory: /home/circleci/workspace/gapic-generator-java
           command: |
             bazel build //:google_java_format_verification
 
@@ -31,6 +30,4 @@ workflows:
   run_tests:
     jobs:
       - gapic-generator-java-tests
-      - google-java-format:
-          requires:
-            - gapic-generator-java-tests
+      - google-java-format