Skip to content

Commit

Permalink
Fix the header-lint job rucio#4980
Browse files Browse the repository at this point in the history
The `header-lint` job of the github actions reports "You have divergent
branches". This is a side effect of pulling the master branch into an already
checked-out repository. Since we have not specified the merge strategy, the job
fails.

We do not need to pull the master branch directly, since the `checkout` github
action automatically pulls the entire history for **all** branches. [1]

This commit removes the pull of the master branch, thus

[1] https://github.com/actions/checkout#fetch-all-history-for-all-tags-and-branches
  • Loading branch information
Joel Dierkes committed Jan 21, 2022
1 parent 80f8c5a commit d1149cd
Showing 1 changed file with 0 additions and 1 deletion.
1 change: 0 additions & 1 deletion .github/workflows/autotest.yml
Expand Up @@ -15,7 +15,6 @@ jobs:
- name: Check headers
shell: bash
run: |
git pull origin master
echo "Current git rev $(git rev-parse HEAD)"
echo "Common ancestor git rev $(git merge-base HEAD remotes/origin/master)"
echo "If a file header needs to be changed run 'tools/add_header -i FILE' from the rucio project directory."
Expand Down

0 comments on commit d1149cd

Please sign in to comment.