Skip to content

Commit

Permalink
Improve commit retrieval
Browse files Browse the repository at this point in the history
  • Loading branch information
Splines committed Nov 14, 2023
1 parent 573a0ac commit bc7afa5
Showing 1 changed file with 57 additions and 20 deletions.
77 changes: 57 additions & 20 deletions .github/workflows/linter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,42 +14,79 @@ jobs:
name: RuboCop
runs-on: ubuntu-latest
steps:
- name: Checkout sources
uses: actions/checkout@v4
# (!!!) https://github.com/actions/checkout/issues/520#issuecomment-1167205721
- name: Get modified files
env:
GH_TOKEN: ${{ github.token }}
run: |
# Get the SHA of the previous commit
previous_commit=$(git rev-parse HEAD^)
# Get the list of modified files
modified_files=$(git diff --name-only $previous_commit ${{ github.sha }})
echo "Modified files:"
echo "$modified_files"
# - name: Determine target branch
# run: |
# target_branch=${{ github.base_ref || 'mampf-next' }}
# echo "Target branch is: $target_branch"
# echo "TARGET_BRANCH=$target_branch" >> $GITHUB_ENV

- name: Set up Ruby 3
uses: ruby/setup-ruby@v1
with:
ruby-version: 3.1.4
bundler-cache: true
# # for the " + 1", see:
# # https://github.com/actions/checkout/issues/552#issuecomment-1167086216
# - name: Calculate fetch depth
# run: |
# depth=$(( ${{ github.pull_request.commits }} + 1 ))
# echo "Fetch depth is: $depth"
# echo "PR_FETCH_DEPTH=$depth" >> $GITHUB_ENV

# - name: 'Checkout PR branch and all PR commits'
# uses: actions/checkout@v3
# with:
# ref: ${{ github.pull_request.head.ref }}
# fetch-depth: ${{ env.PR_FETCH_DEPTH }}

# - name: Fetch target branch with enough history for a common merge-base commit
# run: |
# git fetch origin ${{ github.pull_request.base.ref }}

# - name: Set up Ruby 3
# uses: ruby/setup-ruby@v1
# with:
# ruby-version: 3.1.4
# bundler-cache: true

# If this action is not triggered from a PR, we use 'mampf-next' as default
# target branch to compare against. This might not cover all use cases.
# But in the end, one has to open a PR anyways and then the correct target
# branch is identified.
# TODO: rename to 'dev' when 'mampf-next' branch is renamed.
- name: Fetch target branch
run: |
targetBranch=${{ github.base_ref || 'mampf-next' }}
echo "Target branch is: $targetBranch"
git fetch origin $targetBranch:$targetBranch --depth=1
# - name: Fetch target branch
# run: |
# targetBranch=${{ github.base_ref || 'mampf-next' }}
# echo "Target branch is: $targetBranch"
# git fetch origin $targetBranch:$targetBranch --depth=1

# adapted from https://github.com/actions/checkout/issues/520#issuecomment-1167205721
# and: https://robertfaldo.medium.com/commands-to-run-rubocop-and-specs-you-changed-in-your-branch-e6d2f2e4110b
# --diff-filter=d excludes deleted files
# "|| test $? = 1;" is used to ignore the exit code of grep when no files
# are found matching the pattern
- name: Get changed ruby files (git diff)
run: |
changedFiles=$(git diff --name-only --diff-filter=d -r $targetBranch | grep '\.rb$' || test $? = 1;)
printf "Changed ruby files: \n$changedFiles"
echo "CHANGED_FILES=\"$changedFiles\"" >> $GITHUB_ENV
# For the "three dots" ... syntax, see
# https://community.atlassian.com/t5/Bitbucket-questions/Git-diff-show-different-files-than-PR-Pull-Request/qaq-p/2331786
# - name: Get changed ruby files (git diff)
# run: |
# changedFiles=$(git diff --name-only --diff-filter=d -r $targetBranch...HEAD | grep '\.rb$' || test $? = 1;)
# printf "Changed ruby files: \n$changedFiles"
# echo "CHANGED_FILES=\"$changedFiles\"" >> $GITHUB_ENV

# See RuboCop command line flags here:
# https://docs.rubocop.org/rubocop/usage/basic_usage.html#command-line-flags
- name: Run RuboCop
if: env.CHANGED_FILES != ''
run: $CHANGED_FILES | xargs bundle exec rubocop
# - name: Run RuboCop
# if: env.CHANGED_FILES != ''
# run: $CHANGED_FILES | xargs bundle exec rubocop


# eslint:
Expand Down

0 comments on commit bc7afa5

Please sign in to comment.