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

fee75ce5

Commit fee75ce5 authored 3 years ago by Dmitri Naumov

Downloads
- Plain Diff

Merge branch 'ci-fix' into 'master'

Several CI fixes

See merge request ogs/ogs!3625

parents 906dcad6 7395bbe8

No related branches found

No related tags found

Loading

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

MaterialLib/FractureModels/CMakeLists.txt 3 additions, 1 deletion

MaterialLib/FractureModels/CMakeLists.txt
MaterialLib/SolidModels/CMakeLists.txt 2 additions, 1 deletion

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

ThirdParty/container-maker
scripts/ci/extends/container-maker-setup.yml 1 addition, 1 deletion

scripts/ci/extends/container-maker-setup.yml
scripts/cmake/CPM.cmake 1 addition, 1 deletion

scripts/cmake/CPM.cmake
scripts/cmake/Dependencies.cmake 22 additions, 16 deletions

scripts/cmake/Dependencies.cmake
scripts/cmake/test/CTestCustom.in.cmake 4 additions, 0 deletions

scripts/cmake/test/CTestCustom.in.cmake
web/data/versions.json 1 addition, 1 deletion

web/data/versions.json

with 35 additions and 22 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