From b6c6c1205118091ad88766a804f755d66f083c18 Mon Sep 17 00:00:00 2001
From: Alex Zaharia <alecszaharia@gmail.com>
Date: Wed, 25 Sep 2019 09:40:27 +0300
Subject: [PATCH] Trying to fix the Jenkins file

---
 Jenkinsfile | 31 ++++++++++++++-----------------
 1 file changed, 14 insertions(+), 17 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index ed89b930f4..30910a8864 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -97,6 +97,7 @@ pipeline {
     agent any
     environment {
             GITHUB_TOKEN     = credentials('git-token')
+            SUBVERSION_TOKEN     = credentials('svn-secret')
     }
     stages {
         stage('Version Update') {
@@ -119,21 +120,17 @@ pipeline {
                 sh "sed -i 's/Version:\\s.\\{1,\\}\\..\\{1,\\}\\..\\{1,\\}/Version: ${params.buildVersion}/' brizy.php"
                 sh "sed -i 's/^Stable tag:\\s.\\{1,\\}\\..\\{1,\\}\\..\\{1,\\}/Stable tag: ${params.buildVersion}/' readme.txt"
                 sh "sed -i 's/^Stable tag:\\s.[^<]*/Stable tag: ${params.buildVersion}/' README.md"
-                sh "sed -i \"s/'BRIZY_VERSION',\\s'.\\{1,\\}\\..\\{1,\\}\\..\\{1,\\}'/'BRIZY_VERSION', '${params.buildVersion}'/\" brizy.php"
+                sh "sed -i \"s/'BRIZY_VERSION',\\s'.*'/'BRIZY_VERSION', '${params.buildVersion}'/\" brizy.php"
+                sh "sed -i \"s/'BRIZY_EDITOR_VERSION',\\s'.*'/'BRIZY_EDITOR_VERSION', '${params.editorVersion}'/\" brizy.php"
                 sh "sed -i \"s/'BRIZY_DEVELOPMENT',.[^\\)]*/'BRIZY_DEVELOPMENT', false /\" brizy.php"
-                sh "sed -i \"s/'BRIZY_EDITOR_VERSION',\\s'.\\{1,\\}\\..\\{1,\\}\\..\\{1,\\}'/'BRIZY_EDITOR_VERSION', '${params.editorVersion}'/\" brizy.php"
                 sh "sed -i \"s/'BRIZY_LOG',.[^\\)]*/'BRIZY_LOG', false /\" brizy.php"
-
                 sh "sed -i \"s/== Changelog ==/== Changelog ==\\n\\n= ${params.buildVersion} - "+currentDate+" =\\n${changeLogs}/\" readme.txt"
                 sh "sed -i \"s/## Changelog/## Changelog\\n\\n### ${params.buildVersion} - "+currentDate+" ###\\n${changeLogs}/\" README.md"
-
-
             }
         }
 
         stage('Prepare SVN') {
             steps {
-
                 sh 'cd ' + params.brizySvnPath + ' && svn cleanup && svn revert . -R && svn up'
                 sh 'cd ' + params.brizySvnPath + ' && rm -rf trunk/*'
                 sh 'cp -r * '+ params.brizySvnPath + '/trunk/'
@@ -163,7 +160,17 @@ pipeline {
             }
         }
 
-        stage('Git Merge') {
+        stage('Publish') {
+            when {
+                expression { return params.svnCommit }
+            }
+            steps {
+                sh 'cd ' + params.brizySvnPath + ' && svn cp trunk tags/' + params.buildVersion
+                sh "cd " + params.brizySvnPath + " && svn commit --non-interactive --trust-server-cert --username themefusecom --password '$SUBVERSION_TOKEN'  -m \"Version "+params.buildVersion+"\""
+            }
+        }
+
+         stage('Git Merge') {
             when {
                 expression { return params.gitMerge }
             }
@@ -180,16 +187,6 @@ pipeline {
                 }
             }
         }
-
-        stage('Publish') {
-            when {
-                expression { return params.svnCommit }
-            }
-            steps {
-                sh 'cd ' + params.brizySvnPath + ' && svn cp trunk tags/' + params.buildVersion
-                sh 'cd ' + params.brizySvnPath + ' && svn commit --non-interactive --trust-server-cert --username themefusecom --password \''+params.svnPassword+'\'  -m "Version '+params.buildVersion+'"'
-            }
-        }
     }
 
     post {