diff options
| author | Parthasarathy Tirumalai <parthasarathy.tirumalai@desy.de> | 2024-04-17 13:59:27 +0200 |
|---|---|---|
| committer | Thomas White <taw@physics.org> | 2024-04-17 16:00:02 +0200 |
| commit | 50286a3f5ab0fa4a8d202c5e4f2645823eb3ce4e (patch) | |
| tree | 955cbf07e02754d7115fac0814bbf3717e62bd7c /.gitlab-ci.yml | |
| parent | 0fc2bf21ac356ed63e799b9fef36db0e26505d20 (diff) | |
Add -f option to brew upgrade commands in the MacOS jobs.
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 4 |
1 files 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 |