Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
O
ogs
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Dmitri Naumov
ogs
Commits
5f2e5c2e
Verified
Commit
5f2e5c2e
authored
4 years ago
by
Lars Bilke
Browse files
Options
Downloads
Patches
Plain Diff
[ci] Updated container maker to v2 API.
parent
90472144
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
ThirdParty/container-maker
+1
-1
1 addition, 1 deletion
ThirdParty/container-maker
scripts/ci/jobs/build_image.yml
+3
-3
3 additions, 3 deletions
scripts/ci/jobs/build_image.yml
scripts/ci/jobs/container.yml
+4
-4
4 additions, 4 deletions
scripts/ci/jobs/container.yml
with
8 additions
and
8 deletions
container-maker
@
4464d94a
Compare
4adc2e18
...
4464d94a
Subproject commit 4
adc2e1845d38d05c1eefaf422ba431d90dc6002
Subproject commit 4
464d94a92d0738c26478a6292b26d6df1bb3567
This diff is collapsed.
Click to expand it.
scripts/ci/jobs/build_image.yml
+
3
−
3
View file @
5f2e5c2e
...
...
@@ -10,13 +10,13 @@ build container images:
extends
:
.container-maker-setup
script
:
-
docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
-
poetry run ogscm --build --ogs off
-
poetry run ogscm
compiler.py ogs.py
--build --ogs off
--pm system --cvode --cppcheck --docs --gcovr --tfel --ccache
--tag $CONTAINER_GCC_IMAGE --upload
-
poetry run ogscm --build --ogs off
-
poetry run ogscm
compiler.py ogs.py
--build --ogs off
--pm system --cvode --cppcheck --docs --gcovr --gui --ccache
--tag $CONTAINER_GCC_GUI_IMAGE --upload
-
poetry run ogscm --build --ogs off
-
poetry run ogscm
compiler.py ogs.py
--build --ogs off
--compiler clang --compiler_version 9 --ccache
--tag $CONTAINER_CLANG_IMAGE --upload
...
...
This diff is collapsed.
Click to expand it.
scripts/ci/jobs/container.yml
+
4
−
4
View file @
5f2e5c2e
...
...
@@ -9,18 +9,18 @@ container:
-
.container-maker-setup
script
:
-
>
poetry run ogscm -B -C -R --ogs ../..
poetry run ogscm
compiler.py ogs.py
-B -C -R --ogs ../..
--build_args ' --progress=plain'
--pm system --cvode --ccache
--cmake_args ' -DBUILD_TESTING=OFF -DOGS_BUILD_UTILS=ON'
-
>
poetry run ogscm -B -C -R --ogs ../..
poetry run ogscm
compiler.py mpi.py ogs.py
-B -C -R --ogs ../..
--build_args ' --progress=plain'
--pm system --cvode --ccache
--cmake_args ' -DBUILD_TESTING=OFF'
--ompi 4.0.5 --mpi_benchmarks
--base_image 'centos:8'
--ompi 4.0.5 --mpi_benchmarks
-
>
poetry run ogscm -B -C -R --ogs ../..
poetry run ogscm
compiler.py ogs.py
-B -C -R --ogs ../..
--build_args ' --progress=plain'
--pm system --cvode --ccache
--cmake_args ' -DBUILD_TESTING=OFF'
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment