Merge branch 'envoy-gloo-bump-for-inja' of ssh://github.com/solo-io/g…

…loo into envoy-gloo-bump-for-inja

.github/workflows/codegen.yaml

@@ -21,4 +21,6 @@ jobs:
         id: changed-files
         uses: tj-actions/changed-files@v37
       - name: Check for DO_NOT_SUBMIT
+        # documentation for where we get the list of files to pass into the script:
+        # https://github.com/marketplace/actions/changed-files?version=v37#outputs
         run: ./ci/do-not-submit.sh ${{ steps.changed-files.outputs.all_changed_files }}

changelog/v1.15.0-beta21/do-not-submit-fixes.yaml

@@ -0,0 +1,6 @@
+changelog:
+- type: NON_USER_FACING
+  description: >-
+    Check .proto files for DO_NOT_SUBMIT and do not attempt to check deleted files
+    skipCI-kube-tests:true
+    skipCI-docs-build:true

ci/do-not-submit.sh

@@ -4,7 +4,7 @@
 # of those files for comments including the DO_NOT_SUBMIT keyword. If the
 # keyword is present, the script exits with -1.
 #
-# This initial implementation only checks *.go files for single-line comments
+# This implementation checks go.mod, *.go, and *.proto files for single-line comments
 # (i.e. starting with // rather than /* ... */).
 #
 # This script is invoked by .github/workflows/do-not-submit.yaml
@@ -18,11 +18,11 @@ NEWLINE=$'\n'
 OUTPUT=""
 DO_NOT_SUBMIT_REGEX="[[:space:]]*//[[:space:]]*DO_NOT_SUBMIT"
 
-# Keeps track of number of *.go files (as opposed to all files provided)
+# Keeps track of number of go.mod, *.go, and *.proto files (as opposed to all files provided)
 file_count=0
 for filename in "$@"; do
   # Only check *.go files for now
-  if [[ "$filename" == *".go" || "$filename" == *"go.mod" ]]; then
+  if [[ "$filename" == *".go" || "$filename" == *"go.mod" || "$filename" == *".proto" ]]; then
     ((file_count++))
     line_number=1
     while IFS= read -r line; do
@@ -40,4 +40,4 @@ if [[ "$OUTPUT" == "" ]]; then
 else
   echo "$OUTPUT"
   exit -1
-fi
+fi