Skip to content

Commit b23b862

Browse files
committed
Upped GCC, Clang & AppleClang to latest two versions.
1 parent d8ee3ca commit b23b862

File tree

5 files changed

+89
-35
lines changed

5 files changed

+89
-35
lines changed

.ci/build.py

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
#!/usr/bin/env python
2+
# -*- coding: utf-8 -*-
3+
4+
5+
from bincrafters import build_template_default
6+
7+
if __name__ == "__main__":
8+
9+
builder = build_template_default.get_builder(pure_c=False)
10+
11+
builder.run()

.ci/install.sh

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
#!/usr/bin/env bash
2+
3+
set -ex
4+
5+
if [[ "$(uname -s)" == 'Darwin' ]]; then
6+
brew update || brew update
7+
brew outdated pyenv || brew upgrade pyenv
8+
brew install pyenv-virtualenv
9+
brew install cmake || true
10+
11+
if which pyenv > /dev/null; then
12+
eval "$(pyenv init -)"
13+
fi
14+
15+
pyenv install 3.7.1
16+
pyenv virtualenv 3.7.1 conan
17+
pyenv rehash
18+
pyenv activate conan
19+
fi
20+
21+
pip install conan --upgrade
22+
pip install conan_package_tools bincrafters_package_tools
23+
24+
conan user

.ci/run.sh

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
#!/usr/bin/env bash
2+
3+
set -ex
4+
5+
if [[ "$(uname -s)" == 'Darwin' ]]; then
6+
if which pyenv > /dev/null; then
7+
eval "$(pyenv init -)"
8+
fi
9+
pyenv activate conan
10+
fi
11+
12+
python .ci/build.py

.travis.yml

Lines changed: 24 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
env:
22
global:
3-
- CONAN_LOGIN_USERNAME: helmesjo
4-
- #CONAN_PASSWORD: <specify-in-ci-server>
5-
- REMOTE_REPO: "https://api.bintray.com/conan/helmesjo/public-conan"
3+
- CONAN_USERNAME: "helmesjo"
4+
- CONAN_LOGIN_USERNAME: "helmesjo"
5+
- CONAN_CHANNEL: "stable"
6+
- CONAN_UPLOAD: "https://api.bintray.com/conan/helmesjo/public-conan"
67

78
linux: &linux
89
os: linux
@@ -14,28 +15,35 @@ linux: &linux
1415
osx: &osx
1516
os: osx
1617
language: generic
17-
services:
18-
- docker
1918
matrix:
2019
include:
2120
- <<: *linux
22-
env: CONAN_DOCKER_IMAGE=conanio/gcc8
21+
env: CONAN_GCC_VERSIONS=8 CONAN_DOCKER_IMAGE=conanio/gcc8-x86 CONAN_ARCHS=x86
22+
- <<: *linux
23+
env: CONAN_GCC_VERSIONS=8 CONAN_DOCKER_IMAGE=conanio/gcc8 CONAN_ARCHS=x86_64
24+
- <<: *linux
25+
env: CONAN_GCC_VERSIONS=9 CONAN_DOCKER_IMAGE=conanio/gcc9-x86 CONAN_ARCHS=x86
2326
- <<: *linux
24-
env: CONAN_DOCKER_IMAGE=conanio/gcc9
27+
env: CONAN_GCC_VERSIONS=9 CONAN_DOCKER_IMAGE=conanio/gcc9 CONAN_ARCHS=x86_64
2528
- <<: *linux
26-
env: CONAN_DOCKER_IMAGE=conanio/clang8
29+
env: CONAN_CLANG_VERSIONS=8 CONAN_DOCKER_IMAGE=conanio/clang8-x86 CONAN_ARCHS=x86
2730
- <<: *linux
28-
env: CONAN_DOCKER_IMAGE=conanio/clang9
31+
env: CONAN_CLANG_VERSIONS=8 CONAN_DOCKER_IMAGE=conanio/clang8 CONAN_ARCHS=x86_64
32+
- <<: *linux
33+
env: CONAN_CLANG_VERSIONS=9 CONAN_DOCKER_IMAGE=conanio/clang9-x86 CONAN_ARCHS=x86
34+
- <<: *linux
35+
env: CONAN_CLANG_VERSIONS=9 CONAN_DOCKER_IMAGE=conanio/clang9 CONAN_ARCHS=x86_64
2936
- <<: *osx
3037
osx_image: xcode10.1
3138
env: CONAN_APPLE_CLANG_VERSIONS=10.0
3239
- <<: *osx
3340
osx_image: xcode11
3441
env: CONAN_APPLE_CLANG_VERSIONS=11.0
35-
script: >
36-
docker run --rm --volume $(pwd):/source --workdir /source $CONAN_DOCKER_IMAGE sh -c
37-
"pip install conan==1.20.2 &&
38-
./build.sh &&
39-
conan create . helmesjo/stable &&
40-
conan remote add repo $REMOTE_REPO &&
41-
conan upload '*' -r repo --confirm"
42+
43+
install:
44+
- chmod +x .ci/install.sh
45+
- ./.ci/install.sh
46+
47+
script:
48+
- chmod +x .ci/run.sh
49+
- ./.ci/run.sh

appveyor.yml

Lines changed: 18 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,24 @@
1+
build: false
2+
13
environment:
2-
PYTHON_HOME: "C:\\Python37"
3-
CONAN_LOGIN_USERNAME: helmesjo
4-
#CONAN_PASSWORD: <specify-in-ci-server>
5-
REMOTE_REPO: "https://api.bintray.com/conan/helmesjo/public-conan"
4+
PYTHON: "C:\\Python37"
5+
6+
CONAN_USERNAME: "helmesjo"
7+
CONAN_LOGIN_USERNAME: "helmesjo"
8+
CONAN_CHANNEL: "stable"
9+
CONAN_UPLOAD: "https://api.bintray.com/conan/helmesjo/public-conan"
610

7-
matrix:
8-
- BUILD_TYPE: cmake
9-
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
10-
CONAN_VISUAL_VERSIONS: 15
11-
- BUILD_TYPE: cmake
12-
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
13-
CONAN_VISUAL_VERSIONS: 16
11+
matrix:
12+
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
13+
CONAN_VISUAL_VERSIONS: 15
14+
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
15+
CONAN_VISUAL_VERSIONS: 16
1416

1517
install:
16-
- set PATH=%PYTHON_HOME%;%PYTHON_HOME%/Scripts/;%PATH%
18+
- set PATH=%PATH%;%PYTHON%/Scripts/
1719
- pip.exe install conan --upgrade
20+
- pip.exe install conan_package_tools bincrafters_package_tools
21+
- conan user # It creates the conan data directory
1822

19-
build_script: >
20-
build.sh &&
21-
conan create . helmesjo/stable &&
22-
conan remote add repo %REMOTE_REPO% &&
23-
conan upload "*" -r repo --confirm
24-
25-
deploy: off
23+
test_script:
24+
- python .ci/build.py

0 commit comments

Comments
 (0)