ci: Properly set COMMIT_RANGE in lint task

This commit is contained in:
MarcoFalke 2023-01-02 14:08:07 +01:00
parent d8bdee0fc8
commit fa5cbf2290
No known key found for this signature in database
GPG Key ID: CE2B75697E69A548
2 changed files with 2 additions and 2 deletions

View File

@ -29,6 +29,7 @@ base_template: &BASE_TEMPLATE
- if [ "$CIRRUS_PR" = "" ]; then exit 0; fi
- git fetch $CIRRUS_REPO_CLONE_URL "pull/${CIRRUS_PR}/merge"
- git checkout FETCH_HEAD # Use merged changes to detect silent merge conflicts
# Also, the merge commit is used to lint COMMIT_RANGE="HEAD~..HEAD"
main_template: &MAIN_TEMPLATE
timeout_in: 120m # https://cirrus-ci.org/faq/#instance-timed-out

View File

@ -6,9 +6,8 @@
export LC_ALL=C
GIT_HEAD=$(git rev-parse HEAD)
if [ -n "$CIRRUS_PR" ]; then
COMMIT_RANGE="${CIRRUS_BASE_SHA}..$GIT_HEAD"
COMMIT_RANGE="HEAD~..HEAD"
echo
git log --no-merges --oneline "$COMMIT_RANGE"
echo