Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

#3649 Update CI templates #3651

Merged
merged 7 commits into from
Oct 26, 2018
Merged

#3649 Update CI templates #3651

Changes from 5 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c21b1ab
#3649 Update CI templates
uilianries Oct 1, 2018
603c2fe
#3649 Update Conan Package Tools template
uilianries Oct 2, 2018
806fce7
#3649 Revert Conan reference in new CI
uilianries Oct 8, 2018
a6b90c3
#3649 Update appveyor template to run python3
uilianries Oct 19, 2018
1841836
#3649 Update docker image names
uilianries Oct 19, 2018
ab8456b
#3649 Update unit test for new CI
uilianries Oct 19, 2018
d3deb00
Merge branch 'develop' into feature/update-gitlab
lasote Oct 26, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 11 additions & 12 deletions conans/client/cmd/new_ci.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
{upload}
linux: &linux
os: linux
dist: xenial
sudo: required
language: python
python: "3.6"
Expand All @@ -35,11 +36,11 @@


linux_config_gcc = linux_config + """
env: CONAN_GCC_VERSIONS={version} CONAN_DOCKER_IMAGE=lasote/conangcc{name}
env: CONAN_GCC_VERSIONS={version} CONAN_DOCKER_IMAGE=conanio/gcc{name}
"""

linux_config_clang = linux_config + """
env: CONAN_CLANG_VERSIONS={version} CONAN_DOCKER_IMAGE=lasote/conanclang{name}
env: CONAN_CLANG_VERSIONS={version} CONAN_DOCKER_IMAGE=conanio/clang{name}
"""

osx_config = """
Expand All @@ -48,7 +49,7 @@
env: CONAN_APPLE_CLANG_VERSIONS={version}
"""

build_py = """from conan.packager import ConanMultiPackager
build_py = """from cpt.packager import ConanMultiPackager


if __name__ == "__main__":
Expand Down Expand Up @@ -103,9 +104,7 @@
appveyor = r"""build: false

environment:
PYTHON: "C:\\Python27"
PYTHON_VERSION: "2.7.8"
PYTHON_ARCH: "32"
PYTHON: "C:\\Python37"

CONAN_REFERENCE: "{name}/{version}"
CONAN_USERNAME: "{user}"
Expand Down Expand Up @@ -143,15 +142,15 @@

gitlab_config_gcc = """
gcc-{version}:
image: lasote/conangcc{name}
image: conanio/gcc{name}
variables:
CONAN_GCC_VERSIONS: "{version}"
<<: *build-template
"""

gitlab_config_clang = """
clang-{version}:
image: lasote/conanclang{name}
image: conanio/clang{name}
variables:
CONAN_CLANG_VERSIONS: "{version}"
<<: *build-template
Expand Down Expand Up @@ -185,7 +184,7 @@
circleci_config_gcc = """
gcc-{name}:
docker:
- image: lasote/conangcc{name}
- image: conanio/gcc{name}
environment:
- CONAN_GCC_VERSIONS: "{version}"
<<: *conan-steps
Expand All @@ -194,7 +193,7 @@
circleci_config_clang = """
clang-{name}:
docker:
- image: lasote/conanclang{name}
- image: conanio/clang{name}
environment:
- CONAN_CLANG_VERSIONS: "{version}"
<<: *conan-steps
Expand Down Expand Up @@ -361,8 +360,8 @@ def ci_get_files(name, version, user, channel, visual_versions, linux_gcc_versio
gitlab_gcc_versions or gitlab_clang_versions or circleci_gcc_versions or
circleci_clang_versions or circleci_osx_versions):
return {}
gcc_versions = ["4.9", "5", "6", "7"]
clang_versions = ["3.9", "4.0"]
gcc_versions = ["4.9", "5", "6", "7", "8"]
clang_versions = ["3.9", "4.0", "5.0", "6.0"]
if visual_versions is True:
visual_versions = ["12", "14", "15"]
if linux_gcc_versions is True:
Expand Down