From 2c258739ff09f5b276d440ece64410c0262fefbe Mon Sep 17 00:00:00 2001 From: Richard Otte Date: Tue, 25 Jan 2022 16:16:11 -0500 Subject: [PATCH] ci: Adding set-upstream origin to release pipeline --- jenkinsfile_dev | 2 +- jenkinsfile_pop_detect | 2 +- jenkinsfile_release | 3 ++- package.json | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/jenkinsfile_dev b/jenkinsfile_dev index ecc3c89..34c3adf 100644 --- 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 index 0a11dca..a236cd0 100644 --- 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 index 5d3a8ba..1bfa3cd 100644 --- 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 index 5332a3b..c5b8512 100644 --- 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",