summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Batischev <eual.jp@gmail.com>2020-12-29 15:45:35 +0300
committerAlexander Batischev <eual.jp@gmail.com>2021-01-10 00:22:56 +0300
commit96ae4d115608b7d0719de0627eec55589b4ed904 (patch)
treee158ad4addc3609c243d1100da14a019ac21d1f2
parent7c4fed4df0f28cd734f22f317ce827ad1d754ef2 (diff)
Fix Homebrew clones on macOS Catalina
Also fixes the name of the job, which I forgot to update in 7b2a91d383632e26f4e279f3fbc7f37f9e013e27. (cherry picked from commit e96e23a43ab36fa264e0c37f7c46d42d493a55fc)
-rw-r--r--.cirrus.yml9
1 files changed, 8 insertions, 1 deletions
diff --git a/.cirrus.yml b/.cirrus.yml
index cfeb70c9..f0663ae7 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -97,6 +97,11 @@ macos_task:
after_cache_script: *after_cache_script
install_script:
+ # Fix https://cirrus-ci.com/task/5763464897495040?command=install#L5.
+ # This only applies to macOS Catalina, and will fail on Big Sur because
+ # the clone there is *not* shallow. To prevent that failure from
+ # failing our build, we ignore the failure using `|| true`.
+ - git -C /usr/local/Homebrew/Library/Taps/homebrew/homebrew-core fetch --unshallow || true
- brew update
- brew install rustup-init
- brew install gcc || brew link --overwrite gcc
@@ -151,7 +156,9 @@ macos_task:
RUST: 1.48.0
# This job tests our minimum supported Rust version, so only bump on
# Newsboat release day
- - name: macOS Big Sur, GCC, Rust 1.44.0
+ - name: macOS Catalina, GCC, Rust 1.44.0
+ osx_instance:
+ image: catalina-base
env:
CC: gcc
CXX: g++