small simplification of protodot generation

Signed-off-by: Avi Deitcher <[email protected]>

.github/workflows/ci.yaml

@@ -38,11 +38,15 @@ jobs:
         run: make proto
       - name: check no uncommitted files
         run: |
-          # we run it twice, so that it will report on the logs
-          echo "changed and uncommitted files"
-          git status --short          
-          if [ -n "$(git status --short)" ]; then
+          echo "changed and uncommitted files, excluding versions"
+          diff=$(git diff -I'^\/\/\s+protoc(-gen-go)?\s+v[0-9]+\.[0-9+\.[0-9]+\s*$')
+          if [ -n "diff" ]; then
             # print the diff so we can fix it, if there is an issue
+            echo
+            echo "differences other than tool version changes:"
+            git diff -I'^\/\/\s+protoc(-gen-go)?\s+v[0-9]+\.[0-9+\.[0-9]+\s*$'
+            echo
+            echo "differences including tool version changes:"
             git diff
             exit 1
           fi

Makefile

@@ -1,5 +1,7 @@
 proto-diagram:
-	protodot -inc /usr/include -src ./proto/config/devconfig.proto -output devconfig && cp ~/protodot/generated/devconfig.* ./images && dot ./images/devconfig.dot -Tpng -o ./images/devconfig.png && echo generated ./images/devconfig.*
+	protodot -inc /usr/include -src ./proto/config/devconfig.proto -output devconfig -generated ./images
+	dot ./images/devconfig.dot -Tpng -o ./images/devconfig.png
+	echo generated ./images/devconfig.*
 
 .PHONY: proto-api-%