From a3019b16022ffb83c8d3c7987a4c7ba0eb21552b Mon Sep 17 00:00:00 2001 From: Dawid L Jablonski Date: Thu, 30 Mar 2023 12:07:29 +0200 Subject: [PATCH] Corrected conditions on ng2' --- .github/workflows/pull-request.yml | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index 0ba540823b..d09ad7d3e2 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -111,6 +111,9 @@ jobs: - name: Get branch name uses: Alfresco/alfresco-build-tools/.github/actions/get-branch-name@v1.36.0 + - name: Save commit message + uses: alfresco-build-tools/.github/actions/get-commit-message/action.yml + - name: ci:force flag parser shell: bash run: | @@ -147,10 +150,12 @@ jobs: GH_TOKEN: ${{ github.token }} skip_check: "false" run: | - echo "ci force run: $CI_FORCE_RUN" - if [ "${CI_FORCE_RUN}" == "true" ]; then - echo -e "\033[32m[ci:force] flag detected. No need for approval.\033[0m" - skip_check="true" + if [ "${{ github.event_name }}" == "schedule" ] || [ "${{ github.actor }}" == "dependabot[bot]" ]; then + echo -e "\033[32mci:force check can be skipped\033[0m" + skip_check="true" + elif [[ "$COMMIT_MESSAGE" == "[ci:force]" ]]; then + echo -e "\033[32m[ci:force] flag detected. No need for approval.\033[0m" + skip_check="true" fi if [ "${{ github.actor }}" == "dependabot[bot]" ] || [ "${{ github.actor }}" == "alfresco-build" ]; then