Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
T
trackviewer
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
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
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
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
bioroboticslab
robofish
trackviewer
Commits
614f54e0
Commit
614f54e0
authored
Feb 16, 2021
by
calrama
Browse files
Options
Downloads
Patches
Plain Diff
[ci] add macos support
parent
18194ff2
Branches
Branches containing commit
No related tags found
No related merge requests found
Pipeline
#35504
passed
Feb 16, 2021
Stage: build
Stage: package
Stage: deploy
Changes
5
Pipelines
3
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
.gitlab-ci.yml
+55
-0
55 additions, 0 deletions
.gitlab-ci.yml
ci/prepare.py
+2
-0
2 additions, 0 deletions
ci/prepare.py
python/ci/build.py
+5
-2
5 additions, 2 deletions
python/ci/build.py
python/ci/package.py
+1
-1
1 addition, 1 deletion
python/ci/package.py
python/ci/test.py
+2
-2
2 additions, 2 deletions
python/ci/test.py
with
65 additions
and
5 deletions
.gitlab-ci.yml
+
55
−
0
View file @
614f54e0
...
...
@@ -11,6 +11,9 @@ stages:
tags
:
[
linux
,
docker
]
image
:
git.imp.fu-berlin.de:5000/bioroboticslab/auto/ci/centos:latest
.macos
:
tags
:
[
macos
,
shell
]
.windows
:
tags
:
[
windows
,
docker
]
image
:
git.imp.fu-berlin.de:5000/bioroboticslab/auto/ci/windows:latest-devel
...
...
@@ -59,6 +62,10 @@ stages:
extends
:
.centos
<<
:
*build_cpp
"
build
cpp:
[macos]"
:
extends
:
.macos
<<
:
*build_cpp
"
build
cpp:
[windows]"
:
extends
:
.windows
<<
:
*build_cpp
...
...
@@ -81,6 +88,24 @@ stages:
variables
:
<<
:
[
*python39
]
"
build
python:
[macos,
3.7]"
:
extends
:
.macos
<<
:
*build_python
variables
:
<<
:
[
*python37
]
"
build
python:
[macos,
3.8]"
:
extends
:
.macos
<<
:
*build_python
variables
:
<<
:
[
*python38
]
"
build
python:
[macos,
3.9]"
:
extends
:
.macos
<<
:
*build_python
variables
:
<<
:
[
*python39
]
"
build
python:
[windows,
3.7]"
:
extends
:
.windows
<<
:
*build_python
...
...
@@ -128,6 +153,12 @@ stages:
-
"
build
cpp:
[centos]"
<<
:
*package_cpp
"
package
cpp:
[macos]"
:
extends
:
.macos
dependencies
:
-
"
build
cpp:
[macos]"
<<
:
*package_cpp
"
package
cpp:
[windows]"
:
extends
:
.windows
dependencies
:
...
...
@@ -152,6 +183,24 @@ stages:
-
"
build
python:
[centos,
3.9]"
<<
:
*package_python
"
package
python:
[macos,
3.7]"
:
extends
:
.macos
dependencies
:
-
"
build
python:
[macos,
3.7]"
<<
:
*package_python
"
package
python:
[macos,
3.8]"
:
extends
:
.macos
dependencies
:
-
"
build
python:
[macos,
3.8]"
<<
:
*package_python
"
package
python:
[macos,
3.9]"
:
extends
:
.macos
dependencies
:
-
"
build
python:
[macos,
3.9]"
<<
:
*package_python
"
package
python:
[windows,
3.7]"
:
extends
:
.windows
dependencies
:
...
...
@@ -181,6 +230,9 @@ deploy python to staging:
-
"
package
python:
[centos,
3.7]"
-
"
package
python:
[centos,
3.8]"
-
"
package
python:
[centos,
3.9]"
-
"
package
python:
[macos,
3.7]"
-
"
package
python:
[macos,
3.8]"
-
"
package
python:
[macos,
3.9]"
-
"
package
python:
[windows,
3.7]"
-
"
package
python:
[windows,
3.8]"
-
"
package
python:
[windows,
3.9]"
...
...
@@ -196,6 +248,9 @@ deploy python to production:
-
"
package
python:
[centos,
3.7]"
-
"
package
python:
[centos,
3.8]"
-
"
package
python:
[centos,
3.9]"
-
"
package
python:
[macos,
3.7]"
-
"
package
python:
[macos,
3.8]"
-
"
package
python:
[macos,
3.9]"
-
"
package
python:
[windows,
3.7]"
-
"
package
python:
[windows,
3.8]"
-
"
package
python:
[windows,
3.9]"
...
...
This diff is collapsed.
Click to expand it.
ci/prepare.py
+
2
−
0
View file @
614f54e0
...
...
@@ -48,6 +48,8 @@ if __name__ == "__main__":
os_name
=
"
windows
"
elif
system
()
==
"
Linux
"
:
os_name
=
"
centos
"
elif
system
()
==
"
Darwin
"
:
os_name
=
"
macos
"
else
:
assert
False
...
...
This diff is collapsed.
Click to expand it.
python/ci/build.py
+
5
−
2
View file @
614f54e0
...
...
@@ -11,7 +11,7 @@ from shutil import which
def
python_executable
():
if
system
()
==
"
Windows
"
:
return
f
"
/Python
{
''
.
join
(
env
[
'
PYTHON_VERSION
'
].
split
(
'
.
'
))
}
/python.exe
"
elif
system
()
==
"
Linux
"
:
elif
system
()
==
"
Linux
"
or
system
()
==
"
Darwin
"
:
return
which
(
f
"
python
{
env
[
'
PYTHON_VERSION
'
]
}
"
)
assert
False
...
...
@@ -28,9 +28,12 @@ if __name__ == "__main__":
"
gmpxx.so.4
"
,
"
mpfr.so.4
"
,
]
elif
system
()
==
"
Darwin
"
:
shared_libraries
=
[]
else
:
assert
False
if
len
(
shared_libraries
)
>
0
:
env
[
"
INSTALL_SHARED_LIBRARIES
"
]
=
"
;
"
.
join
(
shared_libraries
)
env
[
"
CMAKE_PREFIX_PATH
"
]
=
str
(
Path
(
"
vendor
"
).
resolve
())
...
...
This diff is collapsed.
Click to expand it.
python/ci/package.py
+
1
−
1
View file @
614f54e0
...
...
@@ -11,7 +11,7 @@ from shutil import which
def
python_executable
():
if
system
()
==
"
Windows
"
:
return
f
"
/Python
{
''
.
join
(
env
[
'
PYTHON_VERSION
'
].
split
(
'
.
'
))
}
/python.exe
"
elif
system
()
==
"
Linux
"
:
elif
system
()
==
"
Linux
"
or
system
()
==
"
Darwin
"
:
return
which
(
f
"
python
{
env
[
'
PYTHON_VERSION
'
]
}
"
)
assert
False
...
...
This diff is collapsed.
Click to expand it.
python/ci/test.py
+
2
−
2
View file @
614f54e0
...
...
@@ -11,7 +11,7 @@ from shutil import which
def
python_executable
():
if
system
()
==
"
Windows
"
:
return
f
"
/Python
{
''
.
join
(
env
[
'
PYTHON_VERSION
'
].
split
(
'
.
'
))
}
/python.exe
"
elif
system
()
==
"
Linux
"
:
elif
system
()
==
"
Linux
"
or
system
()
==
"
Darwin
"
:
return
which
(
f
"
python
{
env
[
'
PYTHON_VERSION
'
]
}
"
)
assert
False
...
...
@@ -19,7 +19,7 @@ def python_executable():
def
python_venv_executable
():
if
system
()
==
"
Windows
"
:
return
str
(
Path
(
"
python/.venv/Scripts/python.exe
"
).
resolve
())
elif
system
()
==
"
Linux
"
:
elif
system
()
==
"
Linux
"
or
system
()
==
"
Darwin
"
:
return
str
(
Path
(
"
python/.venv/bin/python
"
).
resolve
())
assert
False
...
...
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