Skip to content
Snippets Groups Projects

Update .gitlab-ci.yml

Closed Parthasarathy Tirumalai requested to merge (removed):master into master
3 unresolved threads

@thomas.white Please merge this request. It has the following changes:

  1. CentOS7, Fedora, Ubuntu and AlmaLinux/RHEL9 images are run manually and they upload the images in container registry.
  2. CentOs7, Fedora, AlmaLinux/RHEL9 build jobs use the above images and build CrystFEL in CI jobs.

Merge request reports

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
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!

  • Please register or sign in to reply
  • 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 ; \
  • added 5 commits

    Compare with previous version

  • Please register or sign in to reply
    Loading