Skip to content

Commit 93504da

Browse files
committed
ci: Fix COMMIT_RANGE variable value for PRs
1 parent f1dbf92 commit 93504da

File tree

3 files changed

+2
-14
lines changed

3 files changed

+2
-14
lines changed

ci/lint/05_before_script.sh

Lines changed: 0 additions & 9 deletions
This file was deleted.

ci/lint/06_script.sh

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,10 @@
77
export LC_ALL=C
88

99
if [ -n "$CIRRUS_PR" ]; then
10-
# CIRRUS_PR will be present in a Cirrus environment. For builds triggered
11-
# by a pull request this is the name of the branch targeted by the pull request.
12-
# https://cirrus-ci.org/guide/writing-tasks/#environment-variables
13-
COMMIT_RANGE="$CIRRUS_BRANCH..HEAD"
10+
COMMIT_RANGE="$CIRRUS_BASE_SHA..HEAD"
1411
test/lint/commit-script-check.sh $COMMIT_RANGE
1512
fi
13+
export COMMIT_RANGE
1614

1715
# This only checks that the trees are pure subtrees, it is not doing a full
1816
# check with -r to not have to fetch all the remotes.

ci/lint_run_all.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,4 @@ export LC_ALL=C.UTF-8
88

99
set -o errexit; source ./ci/test/00_setup_env.sh
1010
set -o errexit; source ./ci/lint/04_install.sh
11-
set -o errexit; source ./ci/lint/05_before_script.sh
1211
set -o errexit; source ./ci/lint/06_script.sh

0 commit comments

Comments
 (0)