Commit c72e687b authored by Lukas Riedel's avatar Lukas Riedel

ci: Split 'prep' stage into two jobs for GCC and Clang images

parent eef68e1e
......@@ -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:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment