Update to stable/5.7.1

osechet · Jun 21, 2017 · bc041b8 · bc041b8
1 parent 5f2ad6b
commit bc041b8
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 11 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -2,7 +2,7 @@ env:
    global:
      - CONAN_REFERENCE: "Qt/5.7.1"
      - CONAN_USERNAME: "osechet"
-     - CONAN_CHANNEL: "testing"
+     - CONAN_CHANNEL: "stable"
      - CONAN_TOTAL_PAGES: 2
 
 linux: &linux

diff --git a/README.md b/README.md
@@ -1,22 +1,22 @@
 Conan package for Qt
 --------------------------------------------
 
-[![Build Status](https://travis-ci.org/osechet/conan-qt.svg?branch=testing/5.7.1)](https://travis-ci.org/osechet/conan-qt)
+[![Build Status](https://travis-ci.org/osechet/conan-qt.svg?branch=stable/5.7.1)](https://travis-ci.org/osechet/conan-qt)
 
-[![Build status](https://ci.appveyor.com/api/projects/status/gboj3x82d42eoasw/branch/testing/5.7.1?svg=true)](https://ci.appveyor.com/project/osechet/conan-qt)
+[![Build status](https://ci.appveyor.com/api/projects/status/gboj3x82d42eoasw/branch/stable/5.7.1?svg=true)](https://ci.appveyor.com/project/osechet/conan-qt)
 
-[ ![Download](https://api.bintray.com/packages/osechet/Conan/Qt%3Aosechet/images/download.svg?version=5.7.1%3Atesting) ](https://bintray.com/osechet/Conan/Qt%3Aosechet/5.7.1%3Atesting/link)
+[ ![Download](https://api.bintray.com/packages/osechet/Conan/Qt%3Aosechet/images/download.svg?version=5.7.1%3Astable) ](https://bintray.com/osechet/Conan/Qt%3Aosechet/5.7.1%3Astable/link)
 
 [Conan.io](https://conan.io) package for [Qt](https://www.qt.io) library. This package includes by default the Qt Base module (Core, Gui, Widgets, Network, ...). Others modules can be added using options.
 
-The packages generated with this **conanfile** can be found in [conan.io](http://www.conan.io/source/Qt/5.7.1/osechet/testing).
+The packages generated with this **conanfile** can be found in [conan.io](http://www.conan.io/source/Qt/5.7.1/osechet/stable).
 
 ## Reuse the package
 
 ### Basic setup
 
 ```
-$ conan install Qt/5.7.1@osechet/testing
+$ conan install Qt/5.7.1@osechet/stable
 ```
 
 ### Project setup
@@ -25,7 +25,7 @@ If you handle multiple dependencies in your project is better to add a *conanfil
 
 ```
     [requires]
-    Qt/5.7.1@osechet/testing
+    Qt/5.7.1@osechet/stable
 
     [options]
     Qt:shared=true # false
@@ -57,4 +57,4 @@ Project setup installs the library (and all his dependencies) and generates the
 
 ### Upload packages to server
 
-    $ conan upload Qt/5.7.1@osechet/testing --all
+    $ conan upload Qt/5.7.1@osechet/stable --all
diff --git a/appveyor.yml b/appveyor.yml
@@ -7,7 +7,7 @@ environment:
 
     CONAN_REFERENCE: "Qt/5.7.1"
     CONAN_USERNAME: "osechet"
-    CONAN_CHANNEL: "testing"
+    CONAN_CHANNEL: "stable"
     VS150COMNTOOLS: "C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\Community\\Common7\\Tools\\"
 
     matrix:

diff --git a/build.py b/build.py
@@ -6,7 +6,7 @@ def main():
     Main function.
     """
 
-    builder = ConanMultiPackager(username="osechet", channel="testing")
+    builder = ConanMultiPackager(username="osechet", channel="stable")
     builder.add_common_builds()
     filtered_builds = []
     for settings, options, env_vars, build_requires in builder.builds:

diff --git a/list.todo b/list.todo
@@ -0,0 +1,11 @@
+todo:
+- merge testing/5.7.1 to master     OK
+- open release/5.7.1 from master    OK
+- release stable/5.7.1
+- merge release/5.7.1 to master
+- merge master to testing/5.8.0
+- merge testing/5.8.0 to master
+- open release/5.8.0 from master
+- release stable/5.8.0
+- merge release/5.8.0 to master
+- open testing/5.9.0 from master
diff --git a/test_package/conanfile.py b/test_package/conanfile.py
@@ -3,7 +3,7 @@
 from conans import ConanFile, CMake
 
 # This easily allows to copy the package in other user or channel
-CHANNEL = os.getenv("CONAN_CHANNEL", "testing")
+CHANNEL = os.getenv("CONAN_CHANNEL", "stable")
 USERNAME = os.getenv("CONAN_USERNAME", "osechet")
 
 class QtTestConan(ConanFile):