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.

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

Jump to bottom

#3649 Update CI templates #3651

Merged
merged 7 commits into from Oct 26, 2018
Merged

#3649 Update CI templates #3651

Show file tree
Hide file tree
Changes from 2 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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 3 additions & 7 deletions conans/client/cmd/new_ci.py
View file
Open in desktop
Expand Up @@ -3,7 +3,6 @@
travis = """
env:
global:
- CONAN_REFERENCE: "{name}/{version}"
- CONAN_USERNAME: "{user}"
- CONAN_LOGIN_USERNAME: "{user}"
- CONAN_CHANNEL: "{channel}"
Expand Down Expand Up @@ -48,7 +47,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 @@ -107,7 +106,6 @@
PYTHON_VERSION: "2.7.8"
PYTHON_ARCH: "32"

CONAN_REFERENCE: "{name}/{version}"
CONAN_USERNAME: "{user}"
CONAN_LOGIN_USERNAME: "{user}"
CONAN_CHANNEL: "{channel}"
Expand All @@ -128,7 +126,6 @@
gitlab = """
variables:
CONAN_USERNAME: "{user}"
CONAN_REFERENCE: "{name}/{version}"
uilianries marked this conversation as resolved.
Show resolved Hide resolved
CONAN_CHANNEL: "{channel}"
CONAN_LOGIN_USERNAME: "{user}"
{upload}
Expand Down Expand Up @@ -173,7 +170,6 @@
chmod +x .circleci/run.sh
.circleci/run.sh
environment:
CONAN_REFERENCE: "{name}/{version}"
CONAN_USERNAME: "{user}"
CONAN_CHANNEL: "{channel}"
{upload}
Expand Down Expand Up @@ -361,8 +357,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
8 changes: 4 additions & 4 deletions conans/test/command/new_test.py
View file
Open in desktop
Expand Up @@ -126,7 +126,7 @@ def new_ci_test(self):

appveyor = load(os.path.join(root, "appveyor.yml"))
self.assertIn("CONAN_UPLOAD: \"myurl\"", appveyor)
self.assertIn('CONAN_REFERENCE: "MyPackage/1.3"', appveyor)
self.assertNotIn('CONAN_REFERENCE: "MyPackage/1.3"', appveyor)
self.assertIn('CONAN_USERNAME: "myuser"', appveyor)
self.assertIn('CONAN_CHANNEL: "testing"', appveyor)
self.assertIn('CONAN_VISUAL_VERSIONS: 12', appveyor)
Expand All @@ -135,22 +135,22 @@ def new_ci_test(self):

travis = load(os.path.join(root, ".travis.yml"))
self.assertIn("- CONAN_UPLOAD: \"myurl\"", travis)
self.assertIn('- CONAN_REFERENCE: "MyPackage/1.3"', travis)
self.assertNotIn('- CONAN_REFERENCE: "MyPackage/1.3"', travis)
self.assertIn('- CONAN_USERNAME: "myuser"', travis)
self.assertIn('- CONAN_CHANNEL: "testing"', travis)
self.assertIn('env: CONAN_GCC_VERSIONS=5 CONAN_DOCKER_IMAGE=lasote/conangcc5',
travis)

gitlab = load(os.path.join(root, ".gitlab-ci.yml"))
self.assertIn("CONAN_UPLOAD: \"myurl\"", gitlab)
self.assertIn('CONAN_REFERENCE: "MyPackage/1.3"', gitlab)
self.assertNotIn('CONAN_REFERENCE: "MyPackage/1.3"', gitlab)
self.assertIn('CONAN_USERNAME: "myuser"', gitlab)
self.assertIn('CONAN_CHANNEL: "testing"', gitlab)
self.assertIn('CONAN_GCC_VERSIONS: "5"', gitlab)

circleci = load(os.path.join(root, ".circleci", "config.yml"))
self.assertIn("CONAN_UPLOAD: \"myurl\"", circleci)
self.assertIn('CONAN_REFERENCE: "MyPackage/1.3"', circleci)
self.assertNotIn('CONAN_REFERENCE: "MyPackage/1.3"', circleci)
self.assertIn('CONAN_USERNAME: "myuser"', circleci)
self.assertIn('CONAN_CHANNEL: "testing"', circleci)
self.assertIn('CONAN_GCC_VERSIONS: "5"', circleci)
Expand Down