Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

O

ogs
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Requirements
- Environments
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

c9c4b019

Commit c9c4b019 authored 4 years ago by Lars Bilke

Downloads
- Plain Diff

Merge branch 'fix-mfront' into 'master'

[ci] Enable mfront in serial container

See merge request ogs/ogs!3508

parents dd9b10a3 f64b0e20

No related branches found

No related tags found

Loading

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

MaterialLib/SolidModels/MFront/CMakeLists.txt 2 additions, 0 deletions

MaterialLib/SolidModels/MFront/CMakeLists.txt
ThirdParty/container-maker 1 addition, 1 deletion

ThirdParty/container-maker
scripts/ci/jobs/build_image.yml 4 additions, 1 deletion

scripts/ci/jobs/build_image.yml
scripts/ci/jobs/container.yml 1 addition, 1 deletion

scripts/ci/jobs/container.yml
scripts/cmake/Dependencies.cmake 6 additions, 1 deletion

scripts/cmake/Dependencies.cmake
web/content/docs/devguide/advanced/singularity.md 8 additions, 0 deletions

web/content/docs/devguide/advanced/singularity.md
web/content/docs/userguide/basics/container.md 9 additions, 1 deletion

web/content/docs/userguide/basics/container.md
web/data/versions.json 1 addition, 1 deletion

web/data/versions.json

with 32 additions and 6 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment