revert Envoy change, update README - should skip now

.github/scripts/check_skip_ci.sh

@@ -13,15 +13,7 @@ set -euo pipefail
 #
 # ... `git merge-base origin/$SKIP_CHECK_BRANCH HEAD` would return commit `D`
 # `...HEAD` specifies from the common ancestor to the latest commit on the current branch (HEAD)..
-skip_check_branch=${SKIP_CHECK_BRANCH:?SKIP_CHECK_BRANCH is required}
-
-git log -n3 --pretty=oneline
-
-echo "skip check branch: $skip_check_branch"
-echo "git merge-base origin/$skip_check_branch HEAD~: $(git merge-base origin/$skip_check_branch HEAD~)"
-echo "git diff --name-only $(git merge-base origin/$skip_check_branch HEAD~)...HEAD: $(git diff --name-only "$(git merge-base origin/$skip_check_branch HEAD~)"...HEAD)"
-
-files_to_check=$(git diff --name-only "$(git merge-base origin/$skip_check_branch HEAD~)"...HEAD)
+files_to_check=$(git diff --name-only "$(git merge-base origin/$SKIP_CHECK_BRANCH HEAD~)"...HEAD)
 
 # Define the directories to check
 skipped_directories=("_doc/" ".changelog/")

.github/workflows/reusable-conditional-skip.yml

@@ -5,7 +5,7 @@ on:
     outputs:
       skip-ci:
         description: "Whether we should skip build and test jobs"
-        value: ${{ jobs.check-skip.outputs.skip-ci }}
+        value: ${{ jobs.maybe-skip-ci.outputs.skip-ci }}
 
 jobs:
   check-skip:
@@ -18,31 +18,36 @@ jobs:
         with:
           fetch-depth: 0
       - name: Debug - show commits
-        run: git log -n3 --pretty=oneline
+        run: |
+          git log -n3 --pretty=oneline
+          echo "event_name: ${{ github.event_name }}"
+          echo "base_ref: ${{ github.base_ref }}"
+          echo "head_ref: ${{ github.head_ref }}"
+          echo "ref: ${{ github.ref }}"
       - name: Check for skippable file changes
-        id: check-changed-files
+        id: changed-files
         uses: tj-actions/changed-files@v45
         with:
-          files_yaml: |
-            self:
-              - .github/workflows/reusable-conditional-skip.yml
-            doc:
-              - '**.md'
-              - _doc/**
-            changelog:
-              - .changelog/**
+          since_last_remote_commit: false
+          base_sha: ${{ github.base_ref || github.ref }}
+          files: |
+            .github/workflows/reusable-conditional-skip.yml
+            **.md
+            _doc/**
+            .changelog/**
       - name: Print changed files
         env:
           ALL_CHANGED_FILES: ${{ steps.changed-files.outputs.all_changed_files }}
+          NON_SKIPPABLE_FILES: ${{ steps.changed-files.outputs.other_changed_files }}
         run: |
-          echo "Files changed on PR merge branch:"
-          for file in ${ALL_CHANGED_FILES}; do echo "$file"; done
+          echo "All changed on PR merge branch:"
+          for file in ${ALL_CHANGED_FILES}; do echo "  $file"; done
+          echo
+          echo "Non-skippable files changed on PR merge branch:"
+          for file in ${NON_SKIPPABLE_FILES}; do echo "  $file"; done
       - name: Skip tests and build if only skippable files changed
         id: maybe-skip-ci
-        if: ${{ steps.changed-files-yaml.outputs.only_changed == 'true' }}
-        env:
-          ALL_CHANGED_FILES: ${{ steps.changed-files.outputs.all_changed_files }}
+        if: ${{ steps.changed-files.outputs.only_changed == 'true' }}
         run: |
-            echo "Skipping tests and build because only skippable files changed:"
-            for file in ${ALL_CHANGED_FILES}; do echo "$file"; done
+            echo "Skipping tests and build because only skippable files changed"
             echo "skip-ci=true" >> "$GITHUB_OUTPUT"

Dockerfile

@@ -11,7 +11,7 @@
 # prebuilt binaries in any other form.
 #
 ARG GOLANG_VERSION
-FROM envoyproxy/envoy-distroless:v1.31.1 as envoy-binary
+FROM envoyproxy/envoy-distroless:v1.31.2 as envoy-binary
 
 # Modify the envoy binary to be able to bind to privileged ports (< 1024).
 FROM debian:bullseye-slim AS setcap-envoy-binary
@@ -27,7 +27,7 @@ RUN apt-get update && apt install -y libcap2-bin
 RUN setcap CAP_NET_BIND_SERVICE=+ep /usr/local/bin/envoy
 RUN setcap CAP_NET_BIND_SERVICE=+ep /usr/local/bin/$BIN_NAME
 
-FROM hashicorp/envoy-fips:1.31.1-fips1402 as envoy-fips-binary
+FROM hashicorp/envoy-fips:1.31.2-fips1402 as envoy-fips-binary
 
 # Modify the envoy-fips binary to be able to bind to privileged ports (< 1024).
 FROM debian:bullseye-slim AS setcap-envoy-fips-binary

README.md

@@ -3,6 +3,8 @@
   <span>Consul Dataplane</span>
 </h1>
 
+Test doc change
+
 Consul Dataplane is a lightweight process that manages Envoy for Consul service mesh workloads.
 
 Consul Dataplane's design removes the need to run Consul client agents. Removing Consul client