diff options
| author | David Sparer <sparerd@gmail.com> | 2017-03-24 21:14:26 +0300 |
|---|---|---|
| committer | David Sparer <sparerd@gmail.com> | 2017-03-24 21:14:26 +0300 |
| commit | 9e358309e409a01b7e79e97dcabd435f1c1a99c5 (patch) | |
| tree | 89b9e8b3731a393e09f2fa23e2198035a75b223c | |
| parent | d2c2de4dd708e069c45996945609c77d53fc88cb (diff) | |
| parent | 485438f38d8356fd62170b8719986f94b0d67e1e (diff) | |
Merge branch 'master' into resolve_sql_deserialization_issuev1.75Hotfix4
| -rw-r--r-- | Jenkinsfile_publish.groovy | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Jenkinsfile_publish.groovy b/Jenkinsfile_publish.groovy index 9d716f5c..5a8868b3 100644 --- a/Jenkinsfile_publish.groovy +++ b/Jenkinsfile_publish.groovy @@ -13,7 +13,7 @@ node('windows') { stage ('Checkout Branch') { checkout([ $class: 'GitSCM', - branches: [[name: '*/pipeline_tests']], + branches: [[name: '*/${env.TargetBranch}']], doGenerateSubmoduleConfigurations: false, extensions: [], submoduleCfg: [], @@ -57,7 +57,7 @@ node('windows') { def msiPath = "${jobDir}\\Release\\*.zip" // because batch files suck at handling newline characters, we have to convert to base64 in groovy and back to text in powershell def base64Description = env.ReleaseDescription.bytes.encodeBase64().toString() - bat "powershell -ExecutionPolicy Bypass -File \"${jobDir}\\Tools\\publish_to_github.ps1\" -Owner \"mRemoteNG\" -Repository \"mRemoteNG\" -ReleaseTitle \"${env.ReleaseTitle}\" -TagName \"${env.TagName}\" -TargetCommitish \"${env.TargetCommit}\" -Description \"${base64Description}\" -IsDraft ${env.IsDraft} -IsPrerelease ${env.IsPreRelease} -ZipFilePath \"${zipPath}\" -MsiFilePath \"${msiPath}\" -AuthToken \"${env.GH_AUTH_TOKEN}\" -DescriptionIsBase64Encoded" + bat "powershell -ExecutionPolicy Bypass -File \"${jobDir}\\Tools\\publish_to_github.ps1\" -Owner \"mRemoteNG\" -Repository \"mRemoteNG\" -ReleaseTitle \"${env.ReleaseTitle}\" -TagName \"${env.TagName}\" -TargetCommitish \"${env.TargetBranch}\" -Description \"${base64Description}\" -IsDraft ${env.IsDraft} -IsPrerelease ${env.IsPreRelease} -ZipFilePath \"${zipPath}\" -MsiFilePath \"${msiPath}\" -AuthToken \"${env.GH_AUTH_TOKEN}\" -DescriptionIsBase64Encoded" } } }
\ No newline at end of file |