Merge remote-tracking branch 'origin/dev' into v2

jfrog · Jan 7, 2024 · d101242 · d101242
2 parents 417c49d + a71b31f
commit d101242
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -181,7 +181,8 @@ def bumpVersion() {
             sh "build/build.sh"
             fromVersion = getCliVersion("./jf")
             sh "build/bump-version.sh $fromVersion $RELEASE_VERSION"
-            sh "git checkout $masterBranch"
+            sh "git commit -m \"Bump version from $fromVersion to $RELEASE_VERSION\""
+            sh "git push \"https://$GITHUB_ACCESS_TOKEN@github.com/jfrog/jfrog-cli.git\""
         }
     }
 }

diff --git a/build/bump-version.sh b/build/bump-version.sh
@@ -74,7 +74,3 @@ replaceVersion "build/npm/v2-jf/package.json" "\"version\": \"$fromVersion\"," "
 
 # Print success message if validation and replacement pass
 echo "Version bumped successfully."
-
-git commit -m "Bump version from $fromVersion to $toVersion"
-git push
-echo "Version bump pushed to git."