Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
O
ogs
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Iterations
Merge Requests
0
Merge Requests
0
Requirements
Requirements
List
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Test Cases
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Package Registry
Container Registry
Analytics
Analytics
CI / CD
Code Review
Insights
Issue
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Karsten Rink
ogs
Commits
7f0d186f
Commit
7f0d186f
authored
Jun 29, 2020
by
Dmitry Yu. Naumov
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'ci-gui-no-ctest' into 'master'
[ci] Do not run ctests on gui builds. See merge request
ogs/ogs!3025
parents
8f7c60c7
73bc58f5
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
11 additions
and
6 deletions
+11
-6
.gitlab-ci.yml
.gitlab-ci.yml
+2
-0
scripts/ci/extends/template-build-linux.yml
scripts/ci/extends/template-build-linux.yml
+3
-3
scripts/ci/extends/template-build-win.yml
scripts/ci/extends/template-build-win.yml
+3
-3
scripts/ci/jobs/build-gui-linux.yml
scripts/ci/jobs/build-gui-linux.yml
+1
-0
scripts/ci/jobs/build-gui-mac.yml
scripts/ci/jobs/build-gui-mac.yml
+1
-0
scripts/ci/jobs/build-gui-win.yml
scripts/ci/jobs/build-gui-win.yml
+1
-0
No files found.
.gitlab-ci.yml
View file @
7f0d186f
...
...
@@ -18,6 +18,8 @@ variables:
# Build config
BUILD_TYPE
:
Release
BUILD_PROCESSES
:
"
"
# Empty string: builds all processes
BUILD_TESTS
:
"
true"
BUILD_CTEST
:
"
true"
include
:
-
template
:
'
Workflows/MergeRequest-Pipelines.gitlab-ci.yml'
...
...
scripts/ci/extends/template-build-linux.yml
View file @
7f0d186f
...
...
@@ -23,9 +23,9 @@
-DCMAKE_BUILD_TYPE=$BUILD_TYPE
-DOGS_BUILD_PROCESSES=$BUILD_PROCESSES
-
$BUILD_CMD_PREFIX cmake --build . > >(tee make.output)
-
$BUILD_CMD_PREFIX cmake --build . --target tests
-
$BUILD_CMD_PREFIX cmake --build . --target ctest
-
cp Testing/**/Test.xml Tests/ctest.xml
-
if $BUILD_TESTS ; then $BUILD_CMD_PREFIX cmake --build . --target tests ; fi
-
if $BUILD_CTEST ; then $BUILD_CMD_PREFIX cmake --build . --target ctest ; fi
-
if $BUILD_CTEST ; then cp Testing/**/Test.xml Tests/ctest.xml ; fi
cache
:
paths
:
...
...
scripts/ci/extends/template-build-win.yml
View file @
7f0d186f
...
...
@@ -14,9 +14,9 @@
-DCMAKE_BUILD_TYPE="$env:BUILD_TYPE"
-DOGS_BUILD_PROCESSES="$env:BUILD_PROCESSES"
-
cmake --build . --target package | Tee-Object -FilePath make.output
-
cmake --build . --target tests
-
cmake --build . --target ctest
-
cp Testing/**/Test.xml Tests/ctest.xml
-
if($env:BUILD_TESTS -eq "true") { cmake --build . --target tests }
-
if($env:BUILD_CTEST -eq "true") { cmake --build . --target ctest }
-
if($env:BUILD_CTEST -eq "true") { cp Testing/**/Test.xml Tests/ctest.xml }
artifacts
:
paths
:
-
$BUILD_DIR/Tests/ctest.xml
...
...
scripts/ci/jobs/build-gui-linux.yml
View file @
7f0d186f
...
...
@@ -18,6 +18,7 @@ build gui linux:
allow_failure
:
true
variables
:
BUILD_DIR
:
"
build-gui-linux"
BUILD_CTEST
:
"
false"
CMAKE_ARGS
:
>-
-DOGS_USE_CONAN=OFF
-DOGS_BUILD_GUI=ON
...
...
scripts/ci/jobs/build-gui-mac.yml
View file @
7f0d186f
...
...
@@ -16,6 +16,7 @@ build gui mac:
variables
:
BUILD_DIR
:
"
build-gui-mac"
BUILD_CTEST
:
"
false"
CMAKE_ARGS
:
>-
-DOGS_USE_CONAN=OFF
-DOGS_USE_PCH=OFF
...
...
scripts/ci/jobs/build-gui-win.yml
View file @
7f0d186f
...
...
@@ -14,6 +14,7 @@ build gui win:
variables
:
BUILD_DIR
:
build-gui-win
BUILD_CTEST
:
"
false"
CMAKE_ARGS
:
>-
-DOGS_USE_PYTHON=ON
-DOGS_BUILD_GUI=ON
...
...
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