ci: Adding set-upstream origin to release pipeline

sophos · Jan 25, 2022 · 2c25873 · 2c25873
1 parent 4357174
commit 2c25873
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/jenkinsfile_dev b/jenkinsfile_dev
@@ -26,7 +26,7 @@ node('integrations') {
     SimplePipeline pipeline = new SimplePipeline(this)
     pipeline.addCleanupStep('.')
 
-    String gitBranch = pipeline.determineGitBranch(branch)
+    String gitBranch = pipeline.determineGitBranch(params.BRANCH)
     pipeline.setDirectoryFromBranch(gitBranch)
     def gitStage = pipeline.addGitStage(gitUrl, gitBranch, false)
     gitStage.setChangelog(true)

diff --git a/jenkinsfile_pop_detect b/jenkinsfile_pop_detect
@@ -25,7 +25,7 @@ node('integrations') {
     SimplePipeline pipeline = new SimplePipeline(this)
     pipeline.addCleanupStep('.')
 
-    String gitBranch = pipeline.determineGitBranch(branch)
+    String gitBranch = pipeline.determineGitBranch(params.BRANCH)
     pipeline.setDirectoryFromBranch(gitBranch)
     def gitStage = pipeline.addGitStage(gitUrl, gitBranch, false)
     gitStage.setChangelog(true)

diff --git a/jenkinsfile_release b/jenkinsfile_release
@@ -30,7 +30,7 @@ node('integrations') {
     SimplePipeline pipeline = new SimplePipeline(this)
     pipeline.addCleanupStep('.')
 
-    String gitBranch = pipeline.determineGitBranch(branch)
+    String gitBranch = pipeline.determineGitBranch(params.BRANCH)
     pipeline.setDirectoryFromBranch(gitBranch)
     def gitStage = pipeline.addGitStage(gitUrl, gitBranch, false)
     gitStage.setChangelog(true)
@@ -47,6 +47,7 @@ node('integrations') {
         }
 
         pipeline.addStage('Release'){
+            sh 'git push --set-upstream origin $(git rev-parse --abbrev-ref HEAD)'
             sh 'npm ci && npm version $(git rev-parse --abbrev-ref HEAD)'
         }
 

diff --git a/package.json b/package.json
@@ -13,7 +13,7 @@
     "all": "npm run build && npm run format && npm run lint && npm run package && npm test",
     "preversion": "npm test",
     "version": "npm run build && git add -A dist",
-    "postversion": "git push https://github.com/synopsys-sig/detect-action.git && git push https://github.com/synopsys-sig/detect-action.git --tags"
+    "postversion": "git push && git push --tags"
   },
   "repository": {
     "type": "git",