Merge pull request #488 from conan-io/release/0.32.2

Release/0.32.2
conan-io · Mar 31, 2020 · 7ba6f3e · 7ba6f3e
2 parents 22fc2e7 + 1460ab0
commit 7ba6f3e
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 5 deletions.
diff --git a/cpt/__init__.py b/cpt/__init__.py
@@ -1,6 +1,6 @@
 
-__version__ = '0.32.1'
-NEWEST_CONAN_SUPPORTED = "1.23.000"
+__version__ = '0.32.2'
+NEWEST_CONAN_SUPPORTED = "1.24.000"
 
 
 def get_client_version():

diff --git a/cpt/ci_manager.py b/cpt/ci_manager.py
@@ -307,6 +307,8 @@ def get_branch(self):
         branch = os.getenv("GITHUB_REF", None)
         if self.is_pull_request():
             branch = os.getenv("GITHUB_BASE_REF", "")
+        if branch.startswith("refs/heads/"):
+            branch = branch[11:]
         return branch
 
     def is_pull_request(self):

diff --git a/cpt/requirements.txt b/cpt/requirements.txt
@@ -1,3 +1,3 @@
 six>=1.10.0, <1.15.0
-conan>=1.7.0, <1.24.0
+conan>=1.7.0, <1.25.0
 tabulate>=0.8.0, <0.9.0
diff --git a/cpt/test/unit/ci_manager_test.py b/cpt/test/unit/ci_manager_test.py
@@ -218,6 +218,13 @@ def test_github_actions_instance(self):
             self.assertEquals(manager.get_commit_id(), gha_env["GITHUB_SHA"])
             self.assertEquals(manager.is_pull_request(), True)
 
+        gha_env = {"GITHUB_ACTIONS": "true",
+                   "GITHUB_REF": "refs/heads/testing",
+                   "GITHUB_EVENT_NAME": "push"}
+        with tools.environment_append(gha_env):
+            manager = CIManager(self.printer)
+            self.assertEquals(manager.get_branch(), "testing")
+
     def test_build_policy(self):
         # Travis
         with tools.environment_append({"TRAVIS": "1",
@@ -289,5 +296,3 @@ def test_bamboo_env_vars(self):
 
             self.assertEquals(os.getenv('CONAN_LOGIN_USERNAME'), "bamboo")
             self.assertEquals(os.getenv('CONAN_USER_VAR'), "foobar")
-
-