From 50286a3f5ab0fa4a8d202c5e4f2645823eb3ce4e Mon Sep 17 00:00:00 2001 From: Parthasarathy Tirumalai Date: Wed, 17 Apr 2024 13:59:27 +0200 Subject: Add -f option to brew upgrade commands in the MacOS jobs. --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3ed66f20..5336697c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -125,7 +125,7 @@ build-native-macos: GIT_STRATEGY: clone script: - brew update - - brew upgrade + - brew upgrade -f - brew install gsl hdf5 flex bison argp-standalone pkg-config doxygen gtk+3 cairo pango gdk-pixbuf fftw meson ninja - export PATH="$(brew --prefix)/opt/bison/bin:$(brew --prefix)/opt/flex/bin:$PATH" - export LDFLAGS="-L$(brew --prefix)/opt/bison/lib -L$(brew --prefix)/opt/flex/lib -L$(brew --prefix)/opt/argp-standalone/lib -largp $LDFLAGS" @@ -149,7 +149,7 @@ build-brew-macos: GIT_STRATEGY: clone script: - brew update - - brew upgrade + - brew upgrade -f - brew uninstall -v -f crystfel - brew install -v -s ./crystfel.rb --HEAD - brew test crystfel -- cgit v1.2.3