Skip to content

Commit dc582b8

Browse files
authored
Merge pull request python-cmake-buildsystem#172 from jcfr/circleci-parallel
circleci: Enable parallel build using circleci-matrix
2 parents 87b137c + 72baa44 commit dc582b8

3 files changed

Lines changed: 27 additions & 30 deletions

File tree

.circleci-matrix.yml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
env:
2+
- IMAGE=linux-x86 PY_VERSION=2.7.12
3+
- IMAGE=linux-x86 PY_VERSION=3.5.2
4+
command:
5+
- |
6+
if [[ $STEP == "dependencies" ]]; then
7+
ci_addons docker load-pull-save dockcross/$IMAGE
8+
docker run dockcross/$IMAGE > ~/bin/dockcross-$IMAGE; chmod u+x ~/bin/dockcross-$IMAGE
9+
fi
10+
- |
11+
if [[ $STEP == "test" ]]; then
12+
DOCKER_ARGS="-e PY_VERSION=$PY_VERSION -e CIRCLE_SHA1 -e CIRCLE_PR_NUMBER -e CIRCLE_BRANCH -v $HOME/scripts:/usr/scripts"
13+
dockcross-$IMAGE -a "$DOCKER_ARGS" ctest -S /usr/scripts/circle_dashboard.cmake -VV
14+
fi

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ lib
1111

1212
# Ignore all dotfiles...
1313
.*
14+
!.circleci-matrix.yml
1415
!.travis.yml
1516

1617
# Ignore all back-up files...

circle.yml

Lines changed: 12 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,28 @@
11
machine:
2-
python:
3-
version: 2.7.11
42
services:
53
- docker
64

75
dependencies:
86
cache_directories:
9-
- ~/.pyenv
107
- ~/docker
118
override:
129
- docker info
1310

14-
- pip install scikit-ci-addons==0.8.0
11+
- curl -fsSL https://git.io/v2Ifs -o ~/bin/circleci-matrix
12+
- chmod +x ~/bin/circleci-matrix
1513

16-
#- ci_addons docker load-pull-save dockcross/android-arm
17-
#- ci_addons docker load-pull-save dockcross/linux-armv6
18-
#- ci_addons docker load-pull-save dockcross/linux-armv7
19-
#- ci_addons docker load-pull-save dockcross/linux-ppc64le
20-
#- ci_addons docker load-pull-save dockcross/linux-x64
21-
- ci_addons docker load-pull-save dockcross/linux-x86
22-
23-
- |
24-
for image in $(docker images | grep dockcross/[^base] | cut -f1 -d" "); do
25-
docker run ${image} > ~/bin/${image////-}; chmod u+x ~/bin/${image////-}
26-
done
14+
- pip install --user -U scikit-ci-addons
2715

2816
- cd $HOME && git clone git://github.com/python-cmake-buildsystem/python-cmake-buildsystem --branch dashboard --depth 1 scripts
2917

18+
- circleci-matrix:
19+
parallel: true
20+
environment:
21+
STEP: dependencies
22+
3023
test:
3124
override:
32-
# Python 2.7.12
33-
#- dockcross-android-arm -a "-e PY_VERSION=2.7.12 -e CIRCLE_SHA1 -e CIRCLE_PR_NUMBER -e CIRCLE_BRANCH -v $HOME/scripts:/usr/scripts" ctest -S /usr/scripts/circle_dashboard.cmake -VV
34-
#- dockcross-linux-armv6 -a "-e PY_VERSION=2.7.12 -e CIRCLE_SHA1 -e CIRCLE_PR_NUMBER -e CIRCLE_BRANCH -v $HOME/scripts:/usr/scripts" ctest -S /usr/scripts/circle_dashboard.cmake -VV
35-
#- dockcross-linux-armv7 -a "-e PY_VERSION=2.7.12 -e CIRCLE_SHA1 -e CIRCLE_PR_NUMBER -e CIRCLE_BRANCH -v $HOME/scripts:/usr/scripts" ctest -S /usr/scripts/circle_dashboard.cmake -VV
36-
#- dockcross-linux-ppc64le -a "-e PY_VERSION=2.7.12 -e CIRCLE_SHA1 -e CIRCLE_PR_NUMBER -e CIRCLE_BRANCH -v $HOME/scripts:/usr/scripts" ctest -S /usr/scripts/circle_dashboard.cmake -VV
37-
#- dockcross-linux-x64 -a "-e PY_VERSION=2.7.12 -e CIRCLE_SHA1 -e CIRCLE_PR_NUMBER -e CIRCLE_BRANCH -v $HOME/scripts:/usr/scripts" ctest -S /usr/scripts/circle_dashboard.cmake -VV
38-
- dockcross-linux-x86 -a "-e PY_VERSION=2.7.12 -e CIRCLE_SHA1 -e CIRCLE_PR_NUMBER -e CIRCLE_BRANCH -v $HOME/scripts:/usr/scripts" ctest -S /usr/scripts/circle_dashboard.cmake -VV
39-
40-
# Python 3.5.1
41-
#- dockcross-android-arm -a "-e PY_VERSION=3.5.1 -e CIRCLE_SHA1 -e CIRCLE_PR_NUMBER -e CIRCLE_BRANCH -v $HOME/scripts:/usr/scripts" ctest -S /usr/scripts/circle_dashboard.cmake -VV
42-
#- dockcross-linux-armv6 -a "-e PY_VERSION=3.5.1 -e CIRCLE_SHA1 -e CIRCLE_PR_NUMBER -e CIRCLE_BRANCH -v $HOME/scripts:/usr/scripts" ctest -S /usr/scripts/circle_dashboard.cmake -VV
43-
#- dockcross-linux-armv7 -a "-e PY_VERSION=3.5.1 -e CIRCLE_SHA1 -e CIRCLE_PR_NUMBER -e CIRCLE_BRANCH -v $HOME/scripts:/usr/scripts" ctest -S /usr/scripts/circle_dashboard.cmake -VV
44-
#- dockcross-linux-ppc64le -a "-e PY_VERSION=3.5.1 -e CIRCLE_SHA1 -e CIRCLE_PR_NUMBER -e CIRCLE_BRANCH -v $HOME/scripts:/usr/scripts" ctest -S /usr/scripts/circle_dashboard.cmake -VV
45-
#- dockcross-linux-x64 -a "-e PY_VERSION=3.5.1 -e CIRCLE_SHA1 -e CIRCLE_PR_NUMBER -e CIRCLE_BRANCH -v $HOME/scripts:/usr/scripts" ctest -S /usr/scripts/circle_dashboard.cmake -VV
46-
- dockcross-linux-x86 -a "-e PY_VERSION=3.5.1 -e CIRCLE_SHA1 -e CIRCLE_PR_NUMBER -e CIRCLE_BRANCH -v $HOME/scripts:/usr/scripts" ctest -S /usr/scripts/circle_dashboard.cmake -VV
25+
- circleci-matrix:
26+
parallel: true
27+
environment:
28+
STEP: test

0 commit comments

Comments
 (0)