Merge pull request #1363 from lissyx/tag_more_more

Avoid tc-decision.py breakage
mozilla · Apr 28, 2018 · a2670b4 · a2670b4
2 parents b5856b1 + 02980ee
commit a2670b4
Showing 1 changed file with 5 additions and 6 deletions.
diff --git a/tc-schedule.sh b/tc-schedule.sh
@@ -16,12 +16,11 @@ do
     GITHUB_EVENT="${event}" TASK_ID="aa" GITHUB_HEAD_BRANCHORTAG="branchName" GITHUB_HEAD_REF="refs/heads/branchName" python3 ${curdir}/tc-decision.py --dry
 done;
 
-(
-  unset GITHUB_BRANCH
-  unset GITHUB_HEAD_BRANCH
-  unset GITHUB_BASE_BRANCH
-  GITHUB_EVENT="tag" TASK_ID="aa" GITHUB_HEAD_BRANCHORTAG="tagName" GITHUB_HEAD_REF="refs/tags/tagName" python3 ${curdir}/tc-decision.py --dry
-)
+GITHUB_EVENT="tag" TASK_ID="aa" GITHUB_HEAD_BRANCHORTAG="tagName" GITHUB_HEAD_REF="refs/tags/tagName" python3 ${curdir}/tc-decision.py --dry
 
+# Quick hack because tc-decision uses GITHUB_HEAD_BRANCH
+export GITHUB_HEAD_BRANCH="${GITHUB_HEAD_BRANCH}${GITHUB_HEAD_TAG}"
+
+# Create a new env variable for usage in TaskCluster .yml files
 export GITHUB_HEAD_BRANCHORTAG="${GITHUB_HEAD_BRANCH}${GITHUB_HEAD_TAG}"
 python3 ${curdir}/tc-decision.py