An error occurred while fetching participants.
The source project of this merge request has been removed.
Update .gitlab-ci.yml
3 unresolved threads
3 unresolved threads
@thomas.white Please merge this request. It has the following changes:
- CentOS7, Fedora, Ubuntu and AlmaLinux/RHEL9 images are run manually and they upload the images in container registry.
- CentOs7, Fedora, AlmaLinux/RHEL9 build jobs use the above images and build CrystFEL in CI jobs.
Merge request reports
Activity
Filter activity
assigned to @thomas.white
52 52 reports: 53 53 junit: build/meson-logs/testlog.junit.xml 54 54 55 parallel: 56 matrix: 57 - IMAGE: ["centos7","alma9","fedora","ubuntu"] 58 55 59 build-and-test-minimal: 56 image: $CI_REGISTRY_IMAGE/fedora37 60 image: $IMAGE:latest 57 61 script: 58 - meson setup build -Dhdf5=disabled && ninja -C build 59 - ninja -C build test 62 - dnf update -y && dnf group install -y 'Development Tools' && 63 dnf install -y gsl-devel flex bison gcc-c++ gtk3-devel cairo-devel For
build-and-test-minimal
, the dependencies should be really minimal. Try this:- dnf update -y && dnf group install -y 'Development Tools' && dnf install -y gsl-devel flex bison meson - meson setup build -Dhdf5=disabled --wrap-mode=nofallback && ninja -C build && ninja -C build test
Note the reduced
dnf install
list, and the addition of--wrap-mode
. It should still compile and test correctly. If not, let me know because it's probably my fault!
- Dockerfile_fedora 0 → 100644
1 FROM fedora:latest 2 3 ENV CFPREFIX=/software/crystfel/devel 4 ENV PKG_CONFIG_PATH=$CFPREFIX/lib64/pkgconfig:$CFPREFIX/lib/pkgconfig 5 ENV LD_LIBRARY_PATH=$CFPREFIX/lib64:$CFPREFIX/lib 6 ENV LD_RUN_PATH=$CFPREFIX/lib64:$CFPREFIX/lib 7 ENV PATH=$CFPREFIX/bin:$PATH 8 9 RUN dnf -y install epel-release ; \ - run-me-desy-maxwell-centos7 0 → 100644
added 5 commits
-
94bce970...3f0aaaad - 4 commits from branch
thomas.white:master
- 1d6993dc - Merge branch crystfel:master into master
-
94bce970...3f0aaaad - 4 commits from branch
Please register or sign in to reply