Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[CI] Fix test_macos with recent bash for nix-shell #10480

Merged
merged 2 commits into from
Mar 15, 2021
Merged

[CI] Fix test_macos with recent bash for nix-shell #10480

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c0b9f0f
[CI] Initialize nix environment in prepare_build
straight-shoota Mar 6, 2021
11323fe
[CI] Install recent bash for nix-shell on macos
straight-shoota Mar 6, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions bin/ci
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,14 @@ 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

# Note: brew link --force might show:
# Warning: Refusing to link macOS-provided software: llvm
#
Expand Down