From 79c81586a14557462b18f4b83022a63f474150a7 Mon Sep 17 00:00:00 2001 From: Mira Leung Date: Mon, 18 May 2020 21:19:41 +0000 Subject: [PATCH 1/3] [ggj][ci] Run build/linter checks only on commits with applicable files --- .circleci/config.yml | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index d86790845a..04e9e543ff 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -11,7 +11,14 @@ jobs: - run: name: Builder command: | - bazel build //... + LATEST_COMMIT=`git rev-parse HEAD` + NUM_NOCHECKS=`git diff-tree --no-commit-id --name-only -r $LATEST_COMMIT | grep .*.md | wc -l` + NUM_TOTAL=`git diff-tree --no-commit-id --name-only -r $LATEST_COMMIT | grep .*.md | wc -l` + if [ $NUM_NOCHECKS == $NUM_TOTAL ] + then + # Run build checks only if there are non-Markdown files in this change. + bazel build //... + fi google-java-format: docker: - image: l.gcr.io/google/bazel @@ -21,7 +28,13 @@ jobs: - run: name: Java Linter command: | - bazel build //:google_java_format_verification + LATEST_COMMIT=`git rev-parse HEAD` + NUM_JAVA=`git diff-tree --no-commit-id --name-only -r $LATEST_COMMIT | grep .*.java | wc -l` + # Run Java linter checks only if there are Java files in this change. + if [ $NUM_JAVA != 0 ] + then + bazel build //:google_java_format_verification + fi # ======================= WORKFLOWS ======================= From 62914f98a2729e2257df02e81cc78c2b332ea73c Mon Sep 17 00:00:00 2001 From: Mira Leung Date: Mon, 18 May 2020 21:23:31 +0000 Subject: [PATCH 2/3] [ggj][ci] Fix bash commands in circleci file grep --- .circleci/config.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 04e9e543ff..22f3b4c293 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -11,9 +11,9 @@ jobs: - run: name: Builder command: | - LATEST_COMMIT=`git rev-parse HEAD` - NUM_NOCHECKS=`git diff-tree --no-commit-id --name-only -r $LATEST_COMMIT | grep .*.md | wc -l` - NUM_TOTAL=`git diff-tree --no-commit-id --name-only -r $LATEST_COMMIT | grep .*.md | wc -l` + LATEST_COMMIT=$(git rev-parse HEAD) + NUM_NOCHECKS=$(git diff-tree --no-commit-id --name-only -r $LATEST_COMMIT | grep .*.md | wc -l) + NUM_TOTAL=$(git diff-tree --no-commit-id --name-only -r $LATEST_COMMIT | wc -l) if [ $NUM_NOCHECKS == $NUM_TOTAL ] then # Run build checks only if there are non-Markdown files in this change. @@ -28,8 +28,8 @@ jobs: - run: name: Java Linter command: | - LATEST_COMMIT=`git rev-parse HEAD` - NUM_JAVA=`git diff-tree --no-commit-id --name-only -r $LATEST_COMMIT | grep .*.java | wc -l` + LATEST_COMMIT=$(git rev-parse HEAD) + NUM_JAVA=$(git diff-tree --no-commit-id --name-only -r $LATEST_COMMIT | grep .*.java | wc -l) # Run Java linter checks only if there are Java files in this change. if [ $NUM_JAVA != 0 ] then From 3b2c1ea76f42fe925960a61ba38a0a57ecea40e3 Mon Sep 17 00:00:00 2001 From: Mira Leung Date: Mon, 18 May 2020 22:16:45 +0000 Subject: [PATCH 3/3] [ggj][ci] Debug java-format file exclusion --- .circleci/config.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 22f3b4c293..8b47363c7e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -30,11 +30,12 @@ jobs: command: | LATEST_COMMIT=$(git rev-parse HEAD) NUM_JAVA=$(git diff-tree --no-commit-id --name-only -r $LATEST_COMMIT | grep .*.java | wc -l) + echo "$LATEST_COMMIT -> $NUM_JAVA" # Run Java linter checks only if there are Java files in this change. - if [ $NUM_JAVA != 0 ] - then - bazel build //:google_java_format_verification - fi + #if [ $NUM_JAVA != 0 ] + #then + #bazel build //:google_java_format_verification + #fi # ======================= WORKFLOWS =======================