diff options
| -rwxr-xr-x | ci/lint/06_script.sh | 6 | ||||
| -rwxr-xr-x | ci/lint/docker-entrypoint.sh | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/ci/lint/06_script.sh b/ci/lint/06_script.sh index c14d7473d3..fa28f6126c 100755 --- a/ci/lint/06_script.sh +++ b/ci/lint/06_script.sh @@ -6,7 +6,11 @@ export LC_ALL=C -if [ -n "$CIRRUS_PR" ]; then +if [ -n "$LOCAL_BRANCH" ]; then + # To faithfully recreate CI linting locally, specify all commits on the current + # branch. + COMMIT_RANGE="$(git merge-base HEAD master)..HEAD" +elif [ -n "$CIRRUS_PR" ]; then COMMIT_RANGE="HEAD~..HEAD" echo git log --no-merges --oneline "$COMMIT_RANGE" diff --git a/ci/lint/docker-entrypoint.sh b/ci/lint/docker-entrypoint.sh index 6179dfe68b..3fdbbb0761 100755 --- a/ci/lint/docker-entrypoint.sh +++ b/ci/lint/docker-entrypoint.sh @@ -6,7 +6,7 @@ export LC_ALL=C git config --global --add safe.directory /bitcoin if [ -z "$1" ]; then - bash -ic "./ci/lint/06_script.sh" + LOCAL_BRANCH=1 bash -ic "./ci/lint/06_script.sh" else exec "$@" fi |