aboutsummaryrefslogtreecommitdiff
path: root/.cirrus.yml
diff options
context:
space:
mode:
authorMarcoFalke <*~=`'#}+{/-|&$^_@721217.xyz>2023-01-02 14:08:07 +0100
committerMarcoFalke <*~=`'#}+{/-|&$^_@721217.xyz>2023-01-02 14:05:23 +0100
commitfa5cbf2290dab08296cabbd973e9adefc883f3fc (patch)
tree4c38b8e316c6fbe889451c12a3dbc94383e35556 /.cirrus.yml
parentd8bdee0fc889def7c5f5076da13db4fce0a3728a (diff)
downloadbitcoin-fa5cbf2290dab08296cabbd973e9adefc883f3fc.tar.xz
ci: Properly set COMMIT_RANGE in lint task
Diffstat (limited to '.cirrus.yml')
-rw-r--r--.cirrus.yml1
1 files changed, 1 insertions, 0 deletions
diff --git a/.cirrus.yml b/.cirrus.yml
index 7bc346cc30..90988a23e5 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -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