Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
dorie
dorie
Commits
c07c6426
Commit
c07c6426
authored
Sep 26, 2018
by
Lukas Riedel
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Run build job recipes in parallel
Reduce number of CPUs available to DIND runner
parent
2724e0fb
Changes
1
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
5 deletions
+7
-5
.gitlab-ci.yml
.gitlab-ci.yml
+7
-5
No files found.
.gitlab-ci.yml
View file @
c07c6426
...
@@ -2,7 +2,7 @@ variables:
...
@@ -2,7 +2,7 @@ variables:
DUNE_CONTROL_PATH
:
/opt/dune:$CI_PROJECT_DIR
DUNE_CONTROL_PATH
:
/opt/dune:$CI_PROJECT_DIR
DUNECONTROL
:
./dune-common/bin/dunecontrol
DUNECONTROL
:
./dune-common/bin/dunecontrol
CPUS_MULTICORE
:
4
CPUS_MULTICORE
:
4
CPUS_DIND
:
3
CPUS_DIND
:
2
DOCKER_LOGIN
:
DOCKER_LOGIN
:
docker login -u $DOCKER_HUB_USER -p $DOCKER_HUB_PW
docker login -u $DOCKER_HUB_USER -p $DOCKER_HUB_PW
DUNE_ENV_IMAGE
:
DUNE_ENV_IMAGE
:
...
@@ -10,6 +10,8 @@ variables:
...
@@ -10,6 +10,8 @@ variables:
CMAKE_FLAGS
:
CMAKE_FLAGS
:
-DDUNE_PYTHON_VIRTUALENV_SETUP=True
-DDUNE_PYTHON_VIRTUALENV_SETUP=True
-DDUNE_PYTHON_ALLOW_GET_PIP=True
-DDUNE_PYTHON_ALLOW_GET_PIP=True
MAKE_FLAGS
:
-j $CPUS_MULTICORE
image
:
$DUNE_ENV_IMAGE
image
:
$DUNE_ENV_IMAGE
...
@@ -86,7 +88,7 @@ build:system-tests: &build-tests
...
@@ -86,7 +88,7 @@ build:system-tests: &build-tests
script
:
script
:
-
CMAKE_FLAGS="$CMAKE_FLAGS"
-
CMAKE_FLAGS="$CMAKE_FLAGS"
$DUNECONTROL --only=dorie configure
$DUNECONTROL --only=dorie configure
-
$DUNECONTROL --only=dorie make build_system_tests
-
$DUNECONTROL --only=dorie make
$MAKE_FLAGS
build_system_tests
-
$DUNECONTROL --only=dorie make doc
-
$DUNECONTROL --only=dorie make doc
artifacts
:
artifacts
:
name
:
"
$CI_JOB_NAME"
name
:
"
$CI_JOB_NAME"
...
@@ -100,7 +102,7 @@ build:unit-tests:
...
@@ -100,7 +102,7 @@ build:unit-tests:
-
CMAKE_FLAGS="$CMAKE_FLAGS
-
CMAKE_FLAGS="$CMAKE_FLAGS
-DCMAKE_BUILD_TYPE=Debug"
-DCMAKE_BUILD_TYPE=Debug"
$DUNECONTROL --only=dorie configure
$DUNECONTROL --only=dorie configure
-
$DUNECONTROL --only=dorie make build_unit_tests
-
$DUNECONTROL --only=dorie make
$MAKE_FLAGS
build_unit_tests
build:debug: &debug
build:debug: &debug
stage
:
build
stage
:
build
...
@@ -111,7 +113,7 @@ build:debug: &debug
...
@@ -111,7 +113,7 @@ build:debug: &debug
-DCMAKE_BUILD_TYPE=Debug
-DCMAKE_BUILD_TYPE=Debug
-DCMAKE_CXX_FLAGS_DEBUG='-Werror'"
-DCMAKE_CXX_FLAGS_DEBUG='-Werror'"
$DUNECONTROL --only=dorie configure
$DUNECONTROL --only=dorie configure
-
$DUNECONTROL --only=dorie make build_unit_tests
-
$DUNECONTROL --only=dorie make
$MAKE_FLAGS
build_unit_tests
build:debug-clang:
build:debug-clang:
<<
:
*debug
<<
:
*debug
...
@@ -124,7 +126,7 @@ build:debug-clang:
...
@@ -124,7 +126,7 @@ build:debug-clang:
-DCMAKE_CXX_COMPILER=clang++
-DCMAKE_CXX_COMPILER=clang++
-DCMAKE_CXX_FLAGS_DEBUG='-Werror'"
-DCMAKE_CXX_FLAGS_DEBUG='-Werror'"
$DUNECONTROL --only=dorie configure
$DUNECONTROL --only=dorie configure
-
$DUNECONTROL --only=dorie make build_unit_tests
-
$DUNECONTROL --only=dorie make
$MAKE_FLAGS
build_unit_tests
# --- Tests ---
# --- Tests ---
...
...
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