Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
D
dorie
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
31
Issues
31
List
Boards
Labels
Service Desk
Milestones
Merge Requests
9
Merge Requests
9
Operations
Operations
Incidents
Environments
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
dorie
dorie
Commits
c72e687b
Commit
c72e687b
authored
Jun 15, 2018
by
Lukas Riedel
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ci: Split 'prep' stage into two jobs for GCC and Clang images
parent
eef68e1e
Changes
1
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
31 additions
and
4 deletions
+31
-4
.gitlab-ci.yml
.gitlab-ci.yml
+31
-4
No files found.
.gitlab-ci.yml
View file @
c72e687b
...
...
@@ -25,6 +25,8 @@ stages:
-
test
-
deploy
# --- Preparation of Docker Images ---
setup:dune-env: &setup
stage
:
setup
only
:
...
...
@@ -40,11 +42,16 @@ setup:dune-env: &setup
-
$DOCKER_LOGIN
script
:
-
docker build -f docker/dune-env.dockerfile
--build-arg
DUNE_ENV_IMAGE=$DUNE_ENV_IMAGE --build-arg
PROCNUM=$CPUS_DIND
--build-arg PROCNUM=$CPUS_DIND
-t $DUNE_ENV_IMAGE .
-
docker push $DUNE_ENV_IMAGE
-
docker build -f docker/dune-env-clang.dockerfile
--build-arg DUNE_ENV_IMAGE=$DUNE_ENV_IMAGE
--build-arg PROCNUM=$CPUS_DIND
-t ${DUNE_ENV_IMAGE}-clang .
-
docker push ${DUNE_ENV_IMAGE}-clang
prep:update-dune:
prep:update-dune:
&update
<<
:
*setup
stage
:
prep
only
:
...
...
@@ -52,10 +59,22 @@ prep:update-dune:
-
tags
script
:
-
docker build -f docker/dune-env-update.dockerfile
--build-arg DUNE_ENV_IMAGE=$DUNE_ENV_IMAGE --build-arg PROCNUM=$CPUS_DIND
--build-arg DUNE_ENV_IMAGE=$DUNE_ENV_IMAGE
--build-arg PROCNUM=$CPUS_DIND
-t $DUNE_ENV_IMAGE .
-
docker push $DUNE_ENV_IMAGE
prep:update-dune-clang:
<<
:
*update
script
:
-
docker build -f docker/dune-env-update.dockerfile
--build-arg DUNE_ENV_IMAGE={$DUNE_ENV_IMAGE}-clang
--build-arg PROCNUM=$CPUS_DIND
-t {$DUNE_ENV_IMAGE}-clang .
-
docker push {$DUNE_ENV_IMAGE}-clang
# --- Build jobs ---
build:main:
stage
:
build
tags
:
...
...
@@ -72,7 +91,7 @@ build:main:
-
$CI_PROJECT_DIR/build-cmake
expire_in
:
1 day
build:debug:
build:debug:
&debug
stage
:
build
allow_failure
:
true
script
:
...
...
@@ -84,6 +103,12 @@ build:debug:
-
MAKE_FLAGS="$MAKE_FLAGS"
$DUNECONTROL --only=dorie make dorie_mass_conservation
build:debug-clang:
<<
:
*debug
image
:
${DUNE_ENV_IMAGE}-clang
# --- Tests ---
test:exec_cmds: &test
stage
:
test
dependencies
:
...
...
@@ -121,6 +146,8 @@ test:mass_conserve:
-
$DUNECONTROL --only=dorie configure
-
$DUNECONTROL --only=dorie make test_mass_conservation
# --- Deploy jobs ---
deploy:dockerhub-devel: &deploy
stage
:
deploy
only
:
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment