You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by pp...@apache.org on 2023/06/27 12:58:30 UTC
[camel] 02/02: Show git diff before failing a GHA workflow due to uncommitted changes
This is an automated email from the ASF dual-hosted git repository.
ppalaga pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit ccac4796479c4b67ee3fd9e6be4331788f12f106
Author: Peter Palaga <pp...@redhat.com>
AuthorDate: Tue Jun 27 14:24:40 2023 +0200
Show git diff before failing a GHA workflow due to uncommitted changes
---
.github/actions/incremental-build/incremental-build.sh | 2 +-
.github/workflows/pr-build-main.yml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/.github/actions/incremental-build/incremental-build.sh b/.github/actions/incremental-build/incremental-build.sh
index 0b64fcd62ce..74bbef45e35 100755
--- a/.github/actions/incremental-build/incremental-build.sh
+++ b/.github/actions/incremental-build/incremental-build.sh
@@ -103,7 +103,7 @@ function main() {
$mavenBinary -l $log $MVND_OPTS -DskipTests install -pl "$pl" -am
fi
fi
- [[ -z $(git status --porcelain | grep -v antora.yml) ]] || { echo 'There are uncommitted changes'; git status; exit 1; }
+ [[ -z $(git status --porcelain | grep -v antora.yml) ]] || { echo 'There are uncommitted changes'; git status; echo; echo; git diff; exit 1; }
else
local mustSkipTests
mustSkipTests=$(hasLabel ${prId} "skip-tests")
diff --git a/.github/workflows/pr-build-main.yml b/.github/workflows/pr-build-main.yml
index 045b6584bc2..078eab2a9b8 100644
--- a/.github/workflows/pr-build-main.yml
+++ b/.github/workflows/pr-build-main.yml
@@ -63,7 +63,7 @@ jobs:
- name: Fail if there are uncommitted changes
shell: bash
run: |
- [[ -z $(git status --porcelain) ]] || { echo 'There are uncommitted changes'; git status; exit 1; }
+ [[ -z $(git status --porcelain) ]] || { echo 'There are uncommitted changes'; git status; echo; echo; git diff; exit 1; }
- id: test
name: Quick test execution for affected components
uses: ./.github/actions/quick-test