Skip to content
Snippets Groups Projects

Merging develop with develop_mathis

Merged Andi Gerken requested to merge develop into master
1 file
+ 8
8
Compare changes
  • Side-by-side
  • Inline
+ 8
8
@@ -11,11 +11,11 @@ stages:
.macos:
tags: [macos, shell]
.windows:
tags: [windows, docker]
image: git.imp.fu-berlin.de:5000/bioroboticslab/auto/ci/windows:latest-devel
before_script:
- . $Profile.AllUsersAllHosts
#.windows:
# tags: [windows, docker]
# image: git.imp.fu-berlin.de:5000/bioroboticslab/auto/ci/windows:latest-devel
# before_script:
# - . $Profile.AllUsersAllHosts
.python38: &python38
PYTHON_VERSION: "3.8"
@@ -54,9 +54,9 @@ package:
extends: .macos
<<: *test
"test: [windows, 3.8]":
extends: .windows
<<: *test
#"test: [windows, 3.8]":
# extends: .windows
# <<: *test
deploy to staging:
extends: .centos
Loading