From ab0a71a35f40d739f6111e8d3c8406db0d8bc4df Mon Sep 17 00:00:00 2001
From: Adrian Pop <adrian.pop@liu.se>
Date: Mon, 28 Oct 2019 13:03:07 +0100
Subject: [PATCH] fix compliance files handling

---
 .CI/common.groovy | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.CI/common.groovy b/.CI/common.groovy
index ef32f9a9813..831b96a3669 100644
--- a/.CI/common.groovy
+++ b/.CI/common.groovy
@@ -274,7 +274,7 @@ void compliance() {
   sh "mv ${env.COMPLIANCEPREFIX}.html ${env.COMPLIANCEPREFIX}-current.html"
   sh "test -f ${env.COMPLIANCEPREFIX}.xml"
   // Only publish openmodelica-current.html if we are running master
-  sh "cp -p ${env.COMPLIANCEPREFIX}-current.html ${env.COMPLIANCEPREFIX}${cacheBranchEscape()}-${getVersion()}.html"
+  sh "cp -p ${env.COMPLIANCEPREFIX}-current.html ${env.COMPLIANCEPREFIX}${cacheBranch()=='master' ? '' : ('-' + cacheBranchEscape()}-${getVersion()}.html"
   sh "test ! '${cacheBranch()}' = 'master' || rm -f ${env.COMPLIANCEPREFIX}-current.html"
   stash name: "${env.COMPLIANCEPREFIX}", includes: "${env.COMPLIANCEPREFIX}-*.html"
   archiveArtifacts "${env.COMPLIANCEPREFIX}*${getVersion()}.html, ${env.COMPLIANCEPREFIX}.failures"