From c0b9f0f5eaad0557f695d7f173ab699623498e83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20M=C3=BCller?= Date: Sat, 6 Mar 2021 21:50:59 +0100 Subject: [PATCH 1/2] [CI] Initialize nix environment in prepare_build --- bin/ci | 3 +++ 1 file changed, 3 insertions(+) diff --git a/bin/ci b/bin/ci index af0324bae40a..47174ee657a2 100755 --- a/bin/ci +++ b/bin/ci @@ -138,6 +138,9 @@ prepare_build() { on_osx brew update --preinstall on_osx brew bundle --no-lock + # initialize nix environment + on_nix_shell nix-shell + # Note: brew link --force might show: # Warning: Refusing to link macOS-provided software: llvm # From 11323fec2542d48aaac2c2d9dd51a8324b785698 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20M=C3=BCller?= Date: Sat, 6 Mar 2021 23:52:17 +0100 Subject: [PATCH 2/2] [CI] Install recent bash for nix-shell on macos --- bin/ci | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/bin/ci b/bin/ci index 47174ee657a2..dd177876884c 100755 --- a/bin/ci +++ b/bin/ci @@ -138,6 +138,11 @@ prepare_build() { on_osx brew update --preinstall on_osx brew bundle --no-lock + # Install a recent bash version for nix-shell. + # macos ships with an ancient one. + if [ `uname` = "Darwin" ]; then + on_nix_shell "brew install bash" + fi # initialize nix environment on_nix_shell nix-shell