Merge branch 'master' into newline

Author: tinder-maxwellelliott

.bazelrc

@@ -1 +1,2 @@
-run --show_loading_progress=false --show_progress=false --ui_event_filters='ERROR'
+run -c opt --show_loading_progress=false --show_progress=false --ui_event_filters='ERROR'
+run:verbose -c dbg --show_loading_progress=true --show_progress=true --ui_event_filters='INFO,ERROR,DEBUG'

README.md

@@ -66,10 +66,10 @@ Open `bazel-diff-example.sh` to see how this is implemented. This is purely an e
 `bazel-diff` Command
 
 ```terminal
-Usage: bazel-diff [-htV] -b=<bazelPath> [-co=<bazelCommandOptions>]
-                  [-fh=<finalHashesJSONPath>] [-o=<outputPath>]
-                  [-sh=<startingHashesJSONPath>] [-so=<bazelStartupOptions>]
-                  -w=<workspacePath> [COMMAND]
+Usage: bazel-diff [-hV] [-aq=<avoidQuery>] -b=<bazelPath>
+                  [-co=<bazelCommandOptions>] [-fh=<finalHashesJSONPath>]
+                  [-o=<outputPath>] [-sh=<startingHashesJSONPath>]
+                  [-so=<bazelStartupOptions>] -w=<workspacePath> [COMMAND]
 Writes to a file the impacted targets between two Bazel graph JSON files
       -aq, --avoid-query=<avoidQuery>
                   A Bazel query string, any targets that pass this query will
@@ -166,6 +166,14 @@ To run the project
 bazel run :bazel-diff -- bazel-diff -h
 ```
 
+#### Debugging
+
+To run `bazel-diff` with debug logging, run your commands with the `verbose` config like so:
+
+```terminal
+bazel run :bazel-diff --config=verbose -- bazel-diff -h
+```
+
 ### Run Via JAR Release
 
 ```terminal

bazel-diff-example.sh

@@ -15,7 +15,12 @@ final_hashes_json="/tmp/final_hashes.json"
 impacted_targets_path="/tmp/impacted_targets.txt"
 impacted_test_targets_path="/tmp/impacted_test_targets.txt"
 
-$bazel_path run :bazel-diff -- modified-filepaths $previous_revision $final_revision -w $workspace_path -b $bazel_path $modified_filepaths_output
+shared_flags=""
+
+# Uncomment the line below to see debug information
+# shared_flags="--config=verbose"
+
+$bazel_path run :bazel-diff $shared_flags -- modified-filepaths $previous_revision $final_revision -w $workspace_path -b $bazel_path $modified_filepaths_output
 
 IFS=$'\n' read -d '' -r -a modified_filepaths < $modified_filepaths_output
 formatted_filepaths=$(IFS=$'\n'; echo "${modified_filepaths[*]}")
@@ -26,18 +31,18 @@ echo ""
 git -C $workspace_path checkout $previous_revision --quiet
 
 echo "Generating Hashes for Revision '$previous_revision'"
-$bazel_path run :bazel-diff -- generate-hashes -w $workspace_path -b $bazel_path $starting_hashes_json
+$bazel_path run :bazel-diff $shared_flags -- generate-hashes -w $workspace_path -b $bazel_path $starting_hashes_json
 
 git -C $workspace_path checkout - --quiet
 
 echo "Generating Hashes for Revision '$final_revision'"
-$bazel_path run :bazel-diff -- generate-hashes -w $workspace_path -b $bazel_path -m $modified_filepaths_output $final_hashes_json
+$bazel_path run :bazel-diff $shared_flags -- generate-hashes -w $workspace_path -b $bazel_path -m $modified_filepaths_output $final_hashes_json
 
 echo "Determining Impacted Targets"
-$bazel_path run :bazel-diff -- -sh $starting_hashes_json -fh $final_hashes_json -w $workspace_path -b $bazel_path -o $impacted_targets_path
+$bazel_path run :bazel-diff $shared_flags -- -sh $starting_hashes_json -fh $final_hashes_json -w $workspace_path -b $bazel_path -o $impacted_targets_path
 
 echo "Determining Impacted Test Targets"
-$bazel_path run :bazel-diff -- -sh $starting_hashes_json -fh $final_hashes_json -w $workspace_path -b $bazel_path -o $impacted_test_targets_path -t
+$bazel_path run :bazel-diff $shared_flags -- -sh $starting_hashes_json -fh $final_hashes_json -w $workspace_path -b $bazel_path -o $impacted_test_targets_path --avoid-query "//... except tests(//...)"
 
 IFS=$'\n' read -d '' -r -a impacted_targets < $impacted_targets_path
 formatted_impacted_targets=$(IFS=$'\n'; echo "${impacted_targets[*]}")

integration/integration_test.sh

@@ -5,11 +5,12 @@ bazel_path=$(which bazelisk)
 
 previous_revision="HEAD^"
 final_revision="HEAD"
-output_dir=$(mktemp -d)
-modified_filepaths_output="$PWD/integration/modified_filepaths.txt"
+output_dir="/tmp"
+modified_filepaths_output="$workspace_path/modified_filepaths.txt"
 starting_hashes_json="$output_dir/starting_hashes.json"
 final_hashes_json="$output_dir/final_hashes_json.json"
 impacted_targets_path="$output_dir/impacted_targets.txt"
+shared_flags="--config=verbose"
 
 export USE_BAZEL_VERSION=last_downstream_green
 
@@ -20,13 +21,13 @@ containsElement () {
   return 1
 }
 
-$bazel_path run :bazel-diff -- generate-hashes -w $workspace_path -b $bazel_path $starting_hashes_json
+$bazel_path run :bazel-diff $shared_flags -- generate-hashes -w $workspace_path -b $bazel_path $starting_hashes_json
 
-$bazel_path run :bazel-diff -- generate-hashes -w $workspace_path -b $bazel_path -m $modified_filepaths_output $final_hashes_json
+$bazel_path run :bazel-diff $shared_flags -- generate-hashes -w $workspace_path -b $bazel_path -m $modified_filepaths_output $final_hashes_json
 
 ruby ./integration/update_final_hashes.rb
 
-$bazel_path run :bazel-diff -- -sh $starting_hashes_json -fh $final_hashes_json -w $workspace_path -b $bazel_path -o $impacted_targets_path -aq "attr('tags', 'manual', //...)"
+$bazel_path run :bazel-diff $shared_flags -- -sh $starting_hashes_json -fh $final_hashes_json -w $workspace_path -b $bazel_path -o $impacted_targets_path -aq "attr('tags', 'manual', //...)"
 
 IFS=$'\n' read -d '' -r -a impacted_targets < $impacted_targets_path
 target1="//test/java/com/integration:bazel-diff-integration-test-lib"