From 22abe079e9d4e9fb88279d9c50ef378d06a8b1fa Mon Sep 17 00:00:00 2001 From: Damian Ujma <92095156+damianujma@users.noreply.github.com> Date: Tue, 29 Oct 2024 09:15:00 +0100 Subject: [PATCH] ACS-8920 Fix pre-commit for empty commits (#1035) * ACS-8920 Test empty commit * ACS-8920 Test empty commit * ACS-8920 Test empty commit * ACS-8920 Test empty commit * ACS-8920 Pre-commit job should fail * Revert "ACS-8920 Pre-commit job should fail" This reverts commit 80516b76d436c5cb479c8c9edfe3c42edc9131e6. * ACS-8920 Test empty commit * ACS-8920 Remove temporary condition --- .github/workflows/ci.yml | 5 ----- scripts/check-format-and-headers.sh | 6 ++++++ 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b0f7cf07b..a8ce25024 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -37,11 +37,6 @@ env: jobs: pre_commit: runs-on: ubuntu-latest - if: > - !contains(github.event.head_commit.message, '[release]') - outputs: - java_version: ${{ env.JAVA_VERSION }} - java_version_supported_by_repo: ${{ env.JAVA_VERSION_SUPPORTED_BY_REPO }} steps: - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.0.0 - uses: actions/checkout@v4 diff --git a/scripts/check-format-and-headers.sh b/scripts/check-format-and-headers.sh index 4143da166..7cf662604 100755 --- a/scripts/check-format-and-headers.sh +++ b/scripts/check-format-and-headers.sh @@ -7,6 +7,12 @@ else modified_files=${GITHUB_MODIFIED_FILES} fi +if [[ -z ${modified_files} ]] +then + echo "No modified files, exiting." + exit 0 +fi + include_list="" for file in ${modified_files} do