diff options
| author | Thomas White <taw@physics.org> | 2023-09-18 13:05:22 +0200 |
|---|---|---|
| committer | Thomas White <taw@physics.org> | 2023-09-18 13:05:22 +0200 |
| commit | 38b4e5fec7fc9d1cf554afa42b4209f14bc3444f (patch) | |
| tree | 0f2a3697f1ac2b9667b4b1009a666aac24e2d952 /.gitlab-ci.yml | |
| parent | b91c1cdbdbd75b3c23f90faf98340e398f583406 (diff) | |
| parent | b4e92e6b8851fdb45bd55a3b02fae9f5fa216b1a (diff) | |
Merge branch 'millepede'
Fixes: https://gitlab.desy.de/thomas.white/crystfel/-/issues/3
Fixes: https://gitlab.desy.de/thomas.white/crystfel/-/issues/29
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6ce7606b..87fb9f6f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -10,8 +10,8 @@ build-meson: - dnf group install -y 'Development Tools' - dnf install -y hdf5-devel gsl-devel flex bison gcc-c++ - dnf install -y gtk3-devel cairo-devel pango-devel gdk-pixbuf2-devel fftw-devel libpng-devel diffutils - - dnf install -y meson - - meson build && ninja -C build + - dnf install -y meson pandoc + - meson setup build && ninja -C build - ninja -C build test artifacts: when: always @@ -24,10 +24,10 @@ build-meson-nohdf5: image: fedora:37 script: - dnf group install -y 'Development Tools' - - dnf install -y gsl-devel flex bison gcc-c++ + - dnf install -y gsl-devel flex bison gcc-c++ gcc-gfortran - dnf install -y gtk3-devel cairo-devel pango-devel gdk-pixbuf2-devel fftw-devel libpng-devel diffutils - dnf install -y meson - - meson build -Dhdf5=disabled && ninja -C build + - meson setup build -Dhdf5=disabled && ninja -C build - ninja -C build test artifacts: when: always @@ -105,7 +105,7 @@ build-native-macos: - 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" - - meson build + - meson setup build - ninja -C build - ninja -C build test artifacts: |