From cd3da984a8a5e3c8f2a3020de9bae8dbd51e5084 Mon Sep 17 00:00:00 2001
From: Philippe Perrin <philippe.perrin@sonarsource.com>
Date: Tue, 30 Nov 2021 18:08:27 +0100
Subject: [PATCH] [NO-JIRA] Remove Gradle files dependency to Cirrus env
 variables

---
 build.gradle | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/build.gradle b/build.gradle
index 4926b23ed02..17b73f906e1 100644
--- a/build.gradle
+++ b/build.gradle
@@ -611,7 +611,7 @@ subprojects {
     }
   }
 
-  if (System.getenv('CIRRUS_BRANCH') == "branch-nightly-build") {
+  if (System.getenv('GITHUB_BRANCH') == "branch-nightly-build") {
     tasks.withType(Test) {
 
       configurations {
@@ -640,7 +640,7 @@ subprojects {
     def signingPassword = findProperty("signingPassword")
     useInMemoryPgpKeys(signingKeyId, signingKey, signingPassword)
     required {
-      def branch = System.getenv()["CIRRUS_BRANCH"]
+      def branch = System.getenv()["GITHUB_BRANCH"]
       return (branch in ['master', 'dogfood-on-next'] || branch ==~ 'branch-[\\d.]+') &&
              gradle.taskGraph.hasTask(":artifactoryPublish")
     }
@@ -649,7 +649,7 @@ subprojects {
 
   tasks.withType(Sign) {
     onlyIf {
-      def branch = System.getenv()["CIRRUS_BRANCH"]
+      def branch = System.getenv()["GITHUB_BRANCH"]
       return !artifactoryPublish.skip &&
              (branch in ['master', 'dogfood-on-next'] || branch ==~ 'branch-[\\d.]+') &&
              gradle.taskGraph.hasTask(":artifactoryPublish")
-- 
2.39.5