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
f359e1e7
Verified
Commit
f359e1e7
authored
5 years ago
by
Lars Bilke
Browse files
Options
Downloads
Patches
Plain Diff
[ci] Added mac build.
parent
cb3b7f76
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
.gitlab-ci.yml
+3
-0
3 additions, 0 deletions
.gitlab-ci.yml
scripts/ci/jobs/build-mac.yml
+22
-0
22 additions, 0 deletions
scripts/ci/jobs/build-mac.yml
scripts/ci/jobs/checks.yml
+9
-6
9 additions, 6 deletions
scripts/ci/jobs/checks.yml
with
34 additions
and
6 deletions
.gitlab-ci.yml
+
3
−
0
View file @
f359e1e7
...
...
@@ -11,13 +11,16 @@ variables:
PRECOMMIT_IMAGE
:
$CI_REGISTRY_IMAGE/pre-commit
include
:
# extends
-
local
:
'
/scripts/ci/extends/container-maker-setup.yml'
-
local
:
'
/scripts/ci/extends/vs2019-environment.yml'
-
local
:
'
/scripts/ci/extends/test-artifacts.yml'
# jobs
-
local
:
'
/scripts/ci/jobs/pre-commit.yml'
-
local
:
'
/scripts/ci/jobs/build_image.yml'
-
local
:
'
/scripts/ci/jobs/build.yml'
-
local
:
'
/scripts/ci/jobs/build-win.yml'
-
local
:
'
/scripts/ci/jobs/build-mac.yml'
-
local
:
'
/scripts/ci/jobs/checks.yml'
-
local
:
'
/scripts/ci/jobs/container.yml'
-
local
:
'
/scripts/ci/jobs/gui.yml'
This diff is collapsed.
Click to expand it.
scripts/ci/jobs/build-mac.yml
0 → 100644
+
22
−
0
View file @
f359e1e7
build mac
:
stage
:
test
tags
:
-
mac
variables
:
BUILD_DIR
:
"
build-mac"
CCACHE_DIR
:
"
$CI_PROJECT_DIR/.ccache"
cache
:
paths
:
-
.ccache
extends
:
.test-artifacts
before_script
:
-
mkdir -p $BUILD_DIR
-
cd $BUILD_DIR
script
:
-
cmake .. -G Ninja -DCMAKE_BUILD_TYPE=Release -DOGS_BUILD_PROCESSES=GroundwaterFlow
-
cmake --build . > >(tee make.output)
-
cmake --build . --target tests
-
cmake --build . --target ctest
-
cp Testing/**/Test.xml Tests/ctest.xml
This diff is collapsed.
Click to expand it.
scripts/ci/jobs/checks.yml
+
9
−
6
View file @
f359e1e7
...
...
@@ -6,12 +6,15 @@ compiler warnings:
dependencies
:
-
build
-
build win
-
build mac
script
:
-
exit_code=0
-
cd build
-
"
if
[[
$(cat
make.output
|
grep
warning
-i)
]];
then
echo
'There
were
compiler
warnings:';
cat
make.output
|
grep
warning
-i;
exit_code=1;
fi"
-
"
if
[[
$(cat
make.output
|
grep
warning
-i)
]];
then
echo
'There
were
GCC
compiler
warnings:';
cat
make.output
|
grep
warning
-i;
exit_code=1;
fi"
-
cd ../build-win
-
"
if
[[
$(cat
make.output
|
grep
':
warning'
-i)
]];
then
echo
'There
were
compiler
warnings:';
cat
make.output
|
grep
':
warning'
-i;
exit_code=1;
fi"
-
"
if
[[
$(cat
make.output
|
grep
':
warning'
-i)
]];
then
echo
'There
were
MSVC
compiler
warnings:';
cat
make.output
|
grep
':
warning'
-i;
exit_code=1;
fi"
-
cd ../build-mac
-
"
if
[[
$(cat
make.output
|
grep
warning
-i)
]];
then
echo
'There
were
Clang
(macOS)
compiler
warnings:';
cat
make.output
|
grep
warning
-i;
exit_code=1;
fi"
-
exit $exit_code
...
...
@@ -23,16 +26,16 @@ ctest results:
-
singularity
dependencies
:
-
build
-
"
build
win"
-
build win
-
build mac
script
:
-
singularity run docker://$XUNIT_TO_JUNIT_IMAGE -s:./build/Tests/ctest.xml > build/ctest-junit.xml
-
singularity run docker://$XUNIT_TO_JUNIT_IMAGE -s:./build-win/Tests/ctest.xml > build-win/ctest-junit.xml
-
singularity run docker://$XUNIT_TO_JUNIT_IMAGE -s:./build-win/Tests/ctest.xml > build-mac/ctest-junit.xml
artifacts
:
paths
:
-
build/ctest-junit.xml
-
build-win/ctest-junit.xml
expire_in
:
1 week
reports
:
junit
:
-
build/ctest-junit.xml
-
build-win/ctest-junit.xml
-
build-mac/ctest-junit.xml
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