diff options
| author | Thomas White <taw@physics.org> | 2023-08-29 17:11:39 +0200 |
|---|---|---|
| committer | Thomas White <taw@physics.org> | 2023-08-29 17:11:39 +0200 |
| commit | b16431f9637834327c0270927b28be131c577d50 (patch) | |
| tree | c951e7b5f343b4aa7f9f5111728524f5eea747a0 /.gitlab-ci.yml | |
| parent | b50c4f1609e0c030bf6574cf1fdc217e85ed3c33 (diff) | |
CI: Fix 'meson' command, add gcc-gfortran
Fortran compiler is needed for Millepede.
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6ce7606b..9c59035e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -11,7 +11,7 @@ build-meson: - 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 + - 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: |