diff options
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e267cf25..4d1d1038 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,9 +1,8 @@ stages: - test - - test_brew - - build_container - deploy - + - build_container + .build-and-test: image: fedora:32 script: @@ -90,6 +89,8 @@ build_container_image: tags: - kubernetes + when: manual + build_container_image_tag: stage: build_container image: @@ -117,16 +118,17 @@ build_container_image_tag: rules: - if: $CI_COMMIT_TAG + when: manual -build-native-macos: +.build-native-macos: tags: - macOS variables: GIT_STRATEGY: clone script: - brew update - - brew upgrade - - brew install gsl hdf5 flex bison argp-standalone pkg-config doxygen gtk+3 cairo pango gdk-pixbuf fftw meson ninja python python-tk + - 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" - export CFLAGS="-I$(brew --prefix)/opt/flex/include -I$(brew --prefix)/opt/argp-standalone/include/ $CFLAGS" @@ -141,7 +143,6 @@ build-native-macos: junit: build/meson-logs/testlog.junit.xml build-brew-macos: - stage: test_brew dependencies: [] tags: - macOS @@ -149,7 +150,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 |