Fix diff computation for PR container builds

If a PR branch contained several commits but its HEAD had changes to some files not relevant for container build, the no image would be built completely for that PR
janus-idp · Feb 17, 2024 · d3f1153 · d3f1153
1 parent d1cb94d
commit d3f1153
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/.github/workflows/pr-container-build.yaml b/.github/workflows/pr-container-build.yaml
@@ -70,7 +70,7 @@ jobs:
         run: |
           # don't fail if nothing returned by grep
           set +e 
-          CHANGES="$(git diff --name-only HEAD~1 | \
+          CHANGES="$(git diff --name-only ${{ github.event.pull_request.base.sha }}..${{ github.event.pull_request.head.sha }} | \
             grep -E "workflows/.+-container-build.yaml|Makefile|bundle/|config/|go.mod|go.sum|.+\.go|docker/|\.dockerignore" | \
             grep -v -E ".+_test.go|/.rhdh/")";
           echo "Changed files for this commit:"

diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml
@@ -36,7 +36,7 @@ jobs:
         run: |
           # don't fail if nothing returned by grep
           set +e 
-          CHANGES="$(git diff --name-only HEAD~1 | \
+          CHANGES="$(git diff --name-only ${{ github.event.pull_request.base.sha }}..${{ github.event.pull_request.head.sha }} | \
             grep -E "workflows/pr.yaml|Makefile|bundle/|config/|go.mod|go.sum|.+\.go" | \
             grep -v -E "/.rhdh/")";
           echo "Changed files for this commit:"