mirror of
https://github.com/jesseduffield/lazygit.git
synced 2025-05-11 12:25:47 +02:00
Revert "Check for fixup commits on CI"
This reverts commit 7652d579f5
.
Not working on forks, and I don't have time to fix right now
This commit is contained in:
parent
b9107d5fc8
commit
f2db9fa3f9
2 changed files with 0 additions and 47 deletions
22
.github/workflows/ci.yml
vendored
22
.github/workflows/ci.yml
vendored
|
@ -219,25 +219,3 @@ jobs:
|
||||||
CODACY_PROJECT_TOKEN=${{ secrets.CODACY_PROJECT_TOKEN }} \
|
CODACY_PROJECT_TOKEN=${{ secrets.CODACY_PROJECT_TOKEN }} \
|
||||||
bash <(curl -Ls https://coverage.codacy.com/get.sh) report \
|
bash <(curl -Ls https://coverage.codacy.com/get.sh) report \
|
||||||
--force-coverage-parser go -r coverage.out
|
--force-coverage-parser go -r coverage.out
|
||||||
|
|
||||||
check-for-fixups:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
if: github.ref != 'refs/heads/master'
|
|
||||||
steps:
|
|
||||||
# See https://github.com/actions/checkout/issues/552#issuecomment-1167086216
|
|
||||||
- name: "PR commits + 1"
|
|
||||||
run: echo "PR_FETCH_DEPTH=$(( ${{ github.event.pull_request.commits }} + 1 ))" >> "${GITHUB_ENV}"
|
|
||||||
|
|
||||||
- name: "Checkout PR branch and all PR commits"
|
|
||||||
uses: actions/checkout@v4
|
|
||||||
with:
|
|
||||||
ref: ${{ github.event.pull_request.head.ref }}
|
|
||||||
fetch-depth: ${{ env.PR_FETCH_DEPTH }}
|
|
||||||
|
|
||||||
- name: "Fetch the other branch with enough history for a common merge-base commit"
|
|
||||||
run: |
|
|
||||||
git fetch origin ${{ github.event.pull_request.base.ref }}
|
|
||||||
|
|
||||||
- name: Check for fixups
|
|
||||||
run: |
|
|
||||||
./scripts/check_for_fixups.sh ${{ github.event.pull_request.base.ref }}
|
|
||||||
|
|
|
@ -1,25 +0,0 @@
|
||||||
#!/bin/sh
|
|
||||||
|
|
||||||
base_ref=$1
|
|
||||||
|
|
||||||
# Determine the base commit
|
|
||||||
base_commit=$(git merge-base HEAD origin/"$base_ref")
|
|
||||||
|
|
||||||
# Check if base_commit is set correctly
|
|
||||||
if [ -z "$base_commit" ]; then
|
|
||||||
echo "Failed to determine base commit."
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
echo "Base commit: $base_commit"
|
|
||||||
|
|
||||||
# Get commits with "fixup!" in the message from base_commit to HEAD
|
|
||||||
commits=$(git log -i -P --grep "fixup\!" --format="%h %s" "$base_commit..HEAD")
|
|
||||||
|
|
||||||
if [ -z "$commits" ]; then
|
|
||||||
echo "No fixup commits found."
|
|
||||||
exit 0
|
|
||||||
else
|
|
||||||
echo "Fixup commits found:"
|
|
||||||
echo "$commits"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
Loading…
Add table
Add a link
Reference in a new issue