Skip to content
Permalink
Browse files

Merge #2834

2834: Remove redundant CI jobs r=fweik a=jngrad

First PR for #2694

Description of changes:
- updated MacOS X jobs and some Ubuntu 18 jobs to Python3
- removed redundant Python2 jobs: 2 in GitLab CI and 1 in Travis CI
- there should be no difference in coverage (espressomd/docker#78)

Co-authored-by: Jean-Noël Grad <jgrad@icp.uni-stuttgart.de>
  • Loading branch information...
bors and jngrad committed May 14, 2019
2 parents a25c40a + c4763d9 commit 304ddbee4fbb0488d9389e9a78dfbaca43b7f016
Showing with 5 additions and 30 deletions.
  1. +5 −26 .gitlab-ci.yml
  2. +0 −4 .travis.yml
@@ -1,4 +1,4 @@
image: gitlab.icp.uni-stuttgart.de:4567/espressomd/docker/ubuntu:18.04
image: gitlab.icp.uni-stuttgart.de:4567/espressomd/docker/ubuntu-python3:18.04

stages:
- permission
@@ -86,7 +86,7 @@ default:
<<: *global_job_definition
stage: build
script:
- export with_cuda=false myconfig=default with_coverage=true
- export with_cuda=false myconfig=default with_coverage=true python_version=3
- bash maintainer/CI/build_cmake.sh
tags:
- docker
@@ -95,28 +95,16 @@ default:
maxset:
<<: *global_job_definition
stage: build
script:
- export with_cuda=false myconfig=maxset with_coverage=true
- bash maintainer/CI/build_cmake.sh
tags:
- docker
- linux

maxset-python3:
<<: *global_job_definition
stage: build
image: gitlab.icp.uni-stuttgart.de:4567/espressomd/docker/ubuntu-python3:18.04
script:
- export myconfig=maxset with_coverage=true python_version=3
- bash maintainer/CI/build_cmake.sh
tags:
- docker
- linux

no_rotation-python3:
no_rotation:
<<: *global_job_definition
stage: build
image: gitlab.icp.uni-stuttgart.de:4567/espressomd/docker/ubuntu-python3:18.04
script:
- export myconfig=no_rotation with_coverage=true python_version=3
- bash maintainer/CI/build_cmake.sh
@@ -128,7 +116,7 @@ nocheckmaxset:
<<: *global_job_definition
stage: build
script:
- export with_cuda=false myconfig=nocheck-maxset make_check=false
- export with_cuda=false myconfig=nocheck-maxset python_version=3 make_check=false
- bash maintainer/CI/build_cmake.sh
tags:
- docker
@@ -347,15 +335,6 @@ ubuntu:s390x:
### Builds with OS X

osx:
<<: *global_job_definition
stage: build
script:
- export with_ccache=false myconfig=maxset with_cuda=false
- bash maintainer/CI/build_cmake.sh
tags:
- mac

osx-python3:
<<: *global_job_definition
stage: build
script:
@@ -368,7 +347,7 @@ osx-cuda:
<<: *global_job_definition
stage: build
script:
- export with_ccache=false myconfig=maxset with_cuda=true make_check=false
- export with_ccache=false myconfig=maxset with_cuda=true python_version=3 make_check=false
- bash maintainer/CI/build_cmake.sh
tags:
- mac
@@ -8,10 +8,6 @@ branches:

matrix:
include:
- os: linux
sudo: required
services: docker
env: myconfig=maxset python_version=2
- os: linux
sudo: required
services: docker

0 comments on commit 304ddbe

Please sign in to comment.
You can’t perform that action at this time.