Skip to content

Commit

Permalink
conan-io#3649 Update CI templates (conan-io#3651)
Browse files Browse the repository at this point in the history
* conan-io#3649 Update CI templates

- CONAN_REFERENCE is no longer required
- Add GCC 8 on default CI template list
- Add Clang 5, 6 on default CI template list
- Update unit test to avoid CONAN_REFERENCE

Signed-off-by: Uilian Ries <uilianries@gmail.com>

* conan-io#3649 Update Conan Package Tools template

- User new CPT import

Signed-off-by: Uilian Ries <uilianries@gmail.com>

* conan-io#3649 Revert Conan reference in new CI

- Conan reference is mandatory when the recipe does not contain
  name and version.

Signed-off-by: Uilian Ries <uilianries@gmail.com>

* conan-io#3649 Update appveyor template to run python3

- Replace Python27 by Python37. Both Python arch and version are no
longer required.
- Update Travis using Xenial as base image

Signed-off-by: Uilian Ries <uilianries@gmail.com>

* conan-io#3649 Update docker image names

Signed-off-by: Uilian Ries <uilianries@gmail.com>

* conan-io#3649 Update unit test for new CI

Signed-off-by: Uilian Ries <uilianries@gmail.com>
  • Loading branch information
uilianries authored and lasote committed Oct 26, 2018
1 parent 07de941 commit 208f889
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
7 changes: 3 additions & 4 deletions conans/client/cmd/new_ci.py
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 Down Expand Up @@ -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
1 change: 1 addition & 0 deletions conans/test/command/new_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,7 @@ def new_ci_test(self):
self.assertIn('CONAN_REFERENCE: "MyPackage/1.3"', appveyor)
self.assertIn('CONAN_USERNAME: "myuser"', appveyor)
self.assertIn('CONAN_CHANNEL: "testing"', appveyor)
self.assertIn(r'PYTHON: "C:\\Python37"', appveyor)
self.assertIn('CONAN_VISUAL_VERSIONS: 12', appveyor)
self.assertIn('CONAN_VISUAL_VERSIONS: 14', appveyor)
self.assertIn('CONAN_VISUAL_VERSIONS: 15', appveyor)
Expand Down

0 comments on commit 208f889

Please sign in to comment.