File tree 1 file changed +2
-2
lines changed
1 file changed +2
-2
lines changed Original file line number Diff line number Diff line change @@ -22,7 +22,7 @@ env: # Global defaults
22
22
# - The ./ci/ depedencies (with cirrus-cli) should be installed:
23
23
#
24
24
# ```
25
- # apt update && apt install screen python3 bash podman-docker curl -y && curl -L -o cirrus "https://github.com/cirruslabs/cirrus-cli/releases/latest/download/cirrus-linux-$(dpkg --print-architecture)" && mv cirrus /usr/local/bin/cirrus && chmod +x /usr/local/bin/cirrus
25
+ # apt update && apt install git screen python3 bash podman-docker curl -y && curl -L -o cirrus "https://github.com/cirruslabs/cirrus-cli/releases/latest/download/cirrus-linux-$(dpkg --print-architecture)" && mv cirrus /usr/local/bin/cirrus && chmod +x /usr/local/bin/cirrus
26
26
# ```
27
27
#
28
28
# - There are no strict requirements on the hardware, because having less CPUs
@@ -55,7 +55,7 @@ base_template: &BASE_TEMPLATE
55
55
<< : *FILTER_TEMPLATE
56
56
merge_base_script :
57
57
# Unconditionally install git (used in fingerprint_script).
58
- - bash -c "$PACKAGE_MANAGER_INSTALL git"
58
+ - git --version || bash -c "$PACKAGE_MANAGER_INSTALL git"
59
59
- if [ "$CIRRUS_PR" = "" ]; then exit 0; fi
60
60
- git fetch --depth=1 $CIRRUS_REPO_CLONE_URL "pull/${CIRRUS_PR}/merge"
61
61
- git checkout FETCH_HEAD # Use merged changes to detect silent merge conflicts
You can’t perform that action at this time.
0 commit comments