Skip to content

Commit ac13cdf

Browse files
committed
Update CI/conventions
1 parent eddde41 commit ac13cdf

File tree

6 files changed

+34
-30
lines changed

6 files changed

+34
-30
lines changed

.travis/install.sh .ci/install.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ if [[ "$(uname -s)" == 'Darwin' ]]; then
1313
eval "$(pyenv init -)"
1414
fi
1515

16-
pyenv install 2.7.15
17-
pyenv virtualenv 2.7.15 conan
16+
pyenv install 3.7.0
17+
pyenv virtualenv 3.7.0 conan
1818
pyenv rehash
1919
pyenv activate conan
2020
fi

.travis/run.sh .ci/run.sh

File renamed without changes.

.travis.yml

+18-16
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
linux: &linux
22
os: linux
3-
sudo: required
3+
dist: xenial
44
language: python
5-
python: "3.6"
5+
python: "3.7"
66
services:
77
- docker
88
osx: &osx
@@ -11,23 +11,25 @@ osx: &osx
1111
matrix:
1212
include:
1313
- <<: *linux
14-
env: CONAN_GCC_VERSIONS=4.9 CONAN_DOCKER_IMAGE=lasote/conangcc49
14+
env: CONAN_GCC_VERSIONS=4.9 CONAN_DOCKER_IMAGE=conanio/gcc49
1515
- <<: *linux
16-
env: CONAN_GCC_VERSIONS=5 CONAN_DOCKER_IMAGE=lasote/conangcc5
16+
env: CONAN_GCC_VERSIONS=5 CONAN_DOCKER_IMAGE=conanio/gcc5
1717
- <<: *linux
18-
env: CONAN_GCC_VERSIONS=6 CONAN_DOCKER_IMAGE=lasote/conangcc6
18+
env: CONAN_GCC_VERSIONS=6 CONAN_DOCKER_IMAGE=conanio/gcc6
1919
- <<: *linux
20-
env: CONAN_GCC_VERSIONS=7 CONAN_DOCKER_IMAGE=lasote/conangcc7
20+
env: CONAN_GCC_VERSIONS=7 CONAN_DOCKER_IMAGE=conanio/gcc7
2121
- <<: *linux
22-
env: CONAN_GCC_VERSIONS=8 CONAN_DOCKER_IMAGE=lasote/conangcc8
22+
env: CONAN_GCC_VERSIONS=8 CONAN_DOCKER_IMAGE=conanio/gcc8
2323
- <<: *linux
24-
env: CONAN_CLANG_VERSIONS=3.9 CONAN_DOCKER_IMAGE=lasote/conanclang39
24+
env: CONAN_CLANG_VERSIONS=3.9 CONAN_DOCKER_IMAGE=conanio/clang39
2525
- <<: *linux
26-
env: CONAN_CLANG_VERSIONS=4.0 CONAN_DOCKER_IMAGE=lasote/conanclang40
26+
env: CONAN_CLANG_VERSIONS=4.0 CONAN_DOCKER_IMAGE=conanio/clang40
2727
- <<: *linux
28-
env: CONAN_CLANG_VERSIONS=5.0 CONAN_DOCKER_IMAGE=lasote/conanclang50
28+
env: CONAN_CLANG_VERSIONS=5.0 CONAN_DOCKER_IMAGE=conanio/clang50
2929
- <<: *linux
30-
env: CONAN_CLANG_VERSIONS=6.0 CONAN_DOCKER_IMAGE=lasote/conanclang60
30+
env: CONAN_CLANG_VERSIONS=6.0 CONAN_DOCKER_IMAGE=conanio/clang60
31+
- <<: *linux
32+
env: CONAN_CLANG_VERSIONS=7.0 CONAN_DOCKER_IMAGE=conanio/clang7
3133
- <<: *osx
3234
osx_image: xcode7.3
3335
env: CONAN_APPLE_CLANG_VERSIONS=7.3
@@ -41,13 +43,13 @@ matrix:
4143
osx_image: xcode9.4
4244
env: CONAN_APPLE_CLANG_VERSIONS=9.1
4345
- <<: *osx
44-
osx_image: xcode10
46+
osx_image: xcode10.1
4547
env: CONAN_APPLE_CLANG_VERSIONS=10.0
4648

4749
install:
48-
- chmod +x .travis/install.sh
49-
- ./.travis/install.sh
50+
- chmod +x .ci/install.sh
51+
- ./.ci/install.sh
5052

5153
script:
52-
- chmod +x .travis/run.sh
53-
- ./.travis/run.sh
54+
- chmod +x .ci/run.sh
55+
- ./.ci/run.sh

appveyor.yml

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
build: false
22

33
environment:
4-
PYTHON: "C:\\Python27"
5-
PYTHON_VERSION: "2.7.15"
6-
PYTHON_ARCH: "32"
4+
PYTHON: "C:\\Python37"
75

86
matrix:
97
#- MINGW_CONFIGURATIONS: '4.9@x86_64@seh@posix, 4.9@x86_64@sjlj@posix, 4.9@x86@sjlj@posix, 4.9@x86@dwarf2@posix, 6@x86_64@seh@posix, 7@x86_64@seh@posix'

build.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@
66

77
if __name__ == "__main__":
88

9-
builder = build_template_default.get_builder()
9+
builder = build_template_default.get_builder(pure_c=True)
1010

1111
builder.run()

conanfile.py

+12-8
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,13 @@
55
class RubyConan(ConanFile):
66
name = "ruby"
77
version = "2.5.3"
8-
license = "MIT"
9-
url = "https://github.com/elizagamedev/conan-ruby"
108
description = "The Ruby Programming Language"
9+
topics = ("conan", "ruby")
10+
url = "https://github.com/elizagamedev/conan-ruby"
11+
homepage = "https://www.ruby-lang.org"
12+
author = "Eliza Velasquez"
13+
license = "MIT"
1114
settings = "os", "compiler", "build_type", "arch"
12-
requires = "zlib/1.2.11@conan/stable"
13-
build_requires = "ruby_installer/2.5.1@bincrafters/stable"
1415
extensions = (
1516
"dbm",
1617
"gdbm",
@@ -20,9 +21,12 @@ class RubyConan(ConanFile):
2021
"syslog",
2122
)
2223
options = {"with_" + extension: [True, False] for extension in extensions}
23-
default_options = tuple("with_{}=False".format(extension) for extension in extensions)
24+
default_options = {"with_" + extension: False for extension in extensions}
25+
26+
_source_subfolder = "ruby-{}".format(version)
2427

25-
folder = "ruby-{}".format(version)
28+
requires = "zlib/1.2.11@conan/stable"
29+
build_requires = "ruby_installer/2.5.1@bincrafters/stable"
2630

2731
def config_options(self):
2832
del self.settings.compiler.libcxx
@@ -40,13 +44,13 @@ def requirements(self):
4044
def source(self):
4145
tools.get("https://cache.ruby-lang.org/pub/ruby/{}/{}.tar.gz".format(
4246
self.version.rpartition(".")[0],
43-
self.folder))
47+
self._source_subfolder))
4448

4549
def build_configure(self):
4650
without_ext = (tuple(extension for extension in self.extensions
4751
if not getattr(self.options, "with_" + extension)))
4852

49-
with tools.chdir(self.folder):
53+
with tools.chdir(self._source_subfolder):
5054
if self.settings.compiler == "Visual Studio":
5155
with tools.environment_append({"INCLUDE": self.deps_cpp_info.include_paths,
5256
"LIB": self.deps_cpp_info.lib_paths}):

0 commit comments

Comments
 (0)