Skip to content

Commit 87b137c

Browse files
jcfrjcfr
authored
Merge pull request python-cmake-buildsystem#171 from jcfr/simplify-circleci
Simplify circleci
2 parents 052dee0 + 19fcf22 commit 87b137c

2 files changed

Lines changed: 31 additions & 35 deletions

File tree

‎circle.yml‎

Lines changed: 27 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,54 +1,46 @@
11
machine:
2+
python:
3+
version: 2.7.11
24
services:
35
- docker
46

57
dependencies:
68
cache_directories:
7-
- "~/docker"
9+
- ~/.pyenv
10+
- ~/docker
811
override:
912
- docker info
1013

11-
- if [[ -e ~/docker/dockcross-android-arm.tar ]]; then docker load -i ~/docker/dockcross-android-arm.tar; fi
12-
- docker pull dockcross/android-arm
13-
- mkdir -p ~/docker; docker save dockcross/android-arm > ~/docker/dockcross-android-arm.tar
14+
- pip install scikit-ci-addons==0.8.0
1415

15-
- if [[ -e ~/docker/dockcross-linux-armv6.tar ]]; then docker load -i ~/docker/dockcross-linux-armv6.tar; fi
16-
- docker pull dockcross/linux-armv6
17-
- mkdir -p ~/docker; docker save dockcross/linux-armv6 > ~/docker/dockcross-linux-armv6.tar
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
1822

19-
- if [[ -e ~/docker/dockcross-linux-armv7.tar ]]; then docker load -i ~/docker/dockcross-linux-armv7.tar; fi
20-
- docker pull dockcross/linux-armv7
21-
- mkdir -p ~/docker; docker save dockcross/linux-armv7 > ~/docker/dockcross-linux-armv7.tar
22-
23-
- if [[ -e ~/docker/dockcross-linux-ppc64le.tar ]]; then docker load -i ~/docker/dockcross-linux-ppc64le.tar; fi
24-
- docker pull dockcross/linux-ppc64le
25-
- mkdir -p ~/docker; docker save dockcross/linux-ppc64le > ~/docker/dockcross-linux-ppc64le.tar
26-
27-
- if [[ -e ~/docker/dockcross-linux-x64.tar ]]; then docker load -i ~/docker/dockcross-linux-x64.tar; fi
28-
- docker pull dockcross/linux-x64
29-
- mkdir -p ~/docker; docker save dockcross/linux-x64 > ~/docker/dockcross-linux-x64.tar
30-
31-
- if [[ -e ~/docker/dockcross-linux-x86.tar ]]; then docker load -i ~/docker/dockcross-linux-x86.tar; fi
32-
- docker pull dockcross/linux-x86
33-
- mkdir -p ~/docker; docker save dockcross/linux-x86 > ~/docker/dockcross-linux-x86.tar
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
3427
3528
- cd $HOME && git clone git://github.com/python-cmake-buildsystem/python-cmake-buildsystem --branch dashboard --depth 1 scripts
3629

3730
test:
3831
override:
39-
4032
# Python 2.7.12
41-
- docker run --rm -e PY_VERSION=2.7.12 -e CIRCLE_SHA1 -e CIRCLE_PR_NUMBER -e CIRCLE_BRANCH -v ~/python-cmake-buildsystem:/usr/python-cmake-buildsystem:ro -v ~/scripts:/usr/scripts dockcross/android-arm ctest -S /usr/scripts/circle_dashboard.cmake -VV
42-
- docker run --rm -e PY_VERSION=2.7.12 -e CIRCLE_SHA1 -e CIRCLE_PR_NUMBER -e CIRCLE_BRANCH -v ~/python-cmake-buildsystem:/usr/python-cmake-buildsystem:ro -v ~/scripts:/usr/scripts dockcross/linux-armv6 ctest -S /usr/scripts/circle_dashboard.cmake -VV
43-
- docker run --rm -e PY_VERSION=2.7.12 -e CIRCLE_SHA1 -e CIRCLE_PR_NUMBER -e CIRCLE_BRANCH -v ~/python-cmake-buildsystem:/usr/python-cmake-buildsystem:ro -v ~/scripts:/usr/scripts dockcross/linux-armv7 ctest -S /usr/scripts/circle_dashboard.cmake -VV
44-
- docker run --rm -e PY_VERSION=2.7.12 -e CIRCLE_SHA1 -e CIRCLE_PR_NUMBER -e CIRCLE_BRANCH -v ~/python-cmake-buildsystem:/usr/python-cmake-buildsystem:ro -v ~/scripts:/usr/scripts dockcross/linux-ppc64le ctest -S /usr/scripts/circle_dashboard.cmake -VV
45-
- docker run --rm -e PY_VERSION=2.7.12 -e CIRCLE_SHA1 -e CIRCLE_PR_NUMBER -e CIRCLE_BRANCH -v ~/python-cmake-buildsystem:/usr/python-cmake-buildsystem:ro -v ~/scripts:/usr/scripts dockcross/linux-x64 ctest -S /usr/scripts/circle_dashboard.cmake -VV
46-
- docker run --rm -e PY_VERSION=2.7.12 -e CIRCLE_SHA1 -e CIRCLE_PR_NUMBER -e CIRCLE_BRANCH -v ~/python-cmake-buildsystem:/usr/python-cmake-buildsystem:ro -v ~/scripts:/usr/scripts dockcross/linux-x86 ctest -S /usr/scripts/circle_dashboard.cmake -VV
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
4739

4840
# Python 3.5.1
49-
- docker run --rm -e PY_VERSION=3.5.1 -e CIRCLE_SHA1 -e CIRCLE_PR_NUMBER -e CIRCLE_BRANCH -v ~/python-cmake-buildsystem:/usr/python-cmake-buildsystem:ro -v ~/scripts:/usr/scripts dockcross/android-arm ctest -S /usr/scripts/circle_dashboard.cmake -VV
50-
- docker run --rm -e PY_VERSION=3.5.1 -e CIRCLE_SHA1 -e CIRCLE_PR_NUMBER -e CIRCLE_BRANCH -v ~/python-cmake-buildsystem:/usr/python-cmake-buildsystem:ro -v ~/scripts:/usr/scripts dockcross/linux-armv6 ctest -S /usr/scripts/circle_dashboard.cmake -VV
51-
- docker run --rm -e PY_VERSION=3.5.1 -e CIRCLE_SHA1 -e CIRCLE_PR_NUMBER -e CIRCLE_BRANCH -v ~/python-cmake-buildsystem:/usr/python-cmake-buildsystem:ro -v ~/scripts:/usr/scripts dockcross/linux-armv7 ctest -S /usr/scripts/circle_dashboard.cmake -VV
52-
- docker run --rm -e PY_VERSION=3.5.1 -e CIRCLE_SHA1 -e CIRCLE_PR_NUMBER -e CIRCLE_BRANCH -v ~/python-cmake-buildsystem:/usr/python-cmake-buildsystem:ro -v ~/scripts:/usr/scripts dockcross/linux-ppc64le ctest -S /usr/scripts/circle_dashboard.cmake -VV
53-
- docker run --rm -e PY_VERSION=3.5.1 -e CIRCLE_SHA1 -e CIRCLE_PR_NUMBER -e CIRCLE_BRANCH -v ~/python-cmake-buildsystem:/usr/python-cmake-buildsystem:ro -v ~/scripts:/usr/scripts dockcross/linux-x64 ctest -S /usr/scripts/circle_dashboard.cmake -VV
54-
- docker run --rm -e PY_VERSION=3.5.1 -e CIRCLE_SHA1 -e CIRCLE_PR_NUMBER -e CIRCLE_BRANCH -v ~/python-cmake-buildsystem:/usr/python-cmake-buildsystem:ro -v ~/scripts:/usr/scripts dockcross/linux-x86 ctest -S /usr/scripts/circle_dashboard.cmake -VV
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

‎cmake/extensions/CMakeLists.txt‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -303,6 +303,10 @@ else()
303303
_ctypes/libffi/src/${_libffi_system_dir}/ffi64.c
304304
_ctypes/libffi/src/${_libffi_system_dir}/unix64.S
305305
)
306+
elseif("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "i686")
307+
set(_libffi_system_extra_src
308+
_ctypes/libffi/src/${_libffi_system_dir}/win32.S
309+
)
306310
endif()
307311
# To facilitate an eventual contribution of the configuration
308312
# of fficonfig.h to the upstream project, corresponding tests

0 commit comments

Comments
 (0)