From e8abc7f9e1bb621182e8066125199de7a8a34fff Mon Sep 17 00:00:00 2001 From: Scott Gibb <scott.gibb@dyson.com> Date: Mon, 25 Nov 2024 11:44:23 +0000 Subject: [PATCH] reset workflow --- .github/workflows/mega-linter.yml | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/.github/workflows/mega-linter.yml b/.github/workflows/mega-linter.yml index 05dcf800..90bd0e83 100644 --- a/.github/workflows/mega-linter.yml +++ b/.github/workflows/mega-linter.yml @@ -29,7 +29,7 @@ # If APPLY_FIXES is used, defines if the fixes are directly committed (commit) # or posted in a PR (pull_request) - APPLY_FIXES_MODE: commit + APPLY_FIXES_MODE: pull_request concurrency: group: ${{ github.ref }}-${{ github.workflow }} @@ -126,16 +126,15 @@ # Set APPLY_FIXES_IF_* vars for use in future steps - name: Set APPLY_FIXES_IF_* vars run: | - # printf 'APPLY_FIXES_IF_PR=%s\n' "${{ - # env.APPLY_FIXES_IF == 'true' && - # env.APPLY_FIXES_MODE == 'pull_request' - # }}" >> "${GITHUB_ENV}" - # printf 'APPLY_FIXES_IF_COMMIT=%s\n' "${{ - # env.APPLY_FIXES_IF == 'true' && - # env.APPLY_FIXES_MODE == 'commit' && - # (!contains(fromJSON('["refs/heads/main", "refs/heads/master"]'), github.ref)) - # }}" >> "${GITHUB_ENV}" - APPLY_FIXES_IF: true >> "${GITHUB_ENV}" + printf 'APPLY_FIXES_IF_PR=%s\n' "${{ + env.APPLY_FIXES_IF == 'true' && + env.APPLY_FIXES_MODE == 'pull_request' + }}" >> "${GITHUB_ENV}" + printf 'APPLY_FIXES_IF_COMMIT=%s\n' "${{ + env.APPLY_FIXES_IF == 'true' && + env.APPLY_FIXES_MODE == 'commit' && + (!contains(fromJSON('["refs/heads/main", "refs/heads/master"]'), github.ref)) + }}" >> "${GITHUB_ENV}" # Create pull request if applicable # (for now works only on PR from same repository, not from forks)