Skip to content

Commit

Permalink
Make unshallow before merging to properly compare history
Browse files Browse the repository at this point in the history
  • Loading branch information
jakob-fritz committed Apr 17, 2024
1 parent 9cfeea3 commit d1b7250
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion .github/workflows/gitlab_ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ jobs:
- name: check if fast-forward merge is possible
if: github.event_name == 'pull_request_target'
run: |
git fetch
git fetch --unshallow
echo "Checkout of ${{ github.base_ref }}"
git checkout "${{ github.base_ref }}"
echo "Git pull"
Expand All @@ -93,6 +93,7 @@ jobs:
echo MIRROR_BRANCH="$MIRROR_BRANCH" >> $GITHUB_ENV
echo "Create new branch $MIRROR_BRANCH and check it out"
git checkout -b "$MIRROR_BRANCH"
echo "Merge the two parts of the Merge-Request to test the resulting version"
git merge --ff-only "${{ github.event.pull_request.head.sha }}"
- name: Mirror and wait for Gitlab-CI
uses: jakob-fritz/github2lab_action@Iss37_variable_for_checkout
Expand Down

0 comments on commit d1b7250

Please sign in to comment.