From 00d3927df69e64950bcd3ea11b15808e4f265ac0 Mon Sep 17 00:00:00 2001
From: yuobrezkov <yurakirin9545@gmail.com>
Date: Wed, 9 Apr 2025 16:42:34 +0300
Subject: [PATCH] =?UTF-8?q?=D0=9F=D1=80=D0=BE=D0=B2=D0=B5=D1=80=D0=BA?=
 =?UTF-8?q?=D0=B03?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Jenkinsfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 73525ca..730a3cf 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -30,7 +30,7 @@ pipeline {
         stage ('Initialize variables') {
             steps {
                 script {
-                        def lastVersion = sh(script: "git describe --tags --abbrev=0", returnStdout: true).trim()
+                        def lastVersion = sh(script: "git describe --tags --abbrev=0", returnStdout: true).trim() || null
                         
                         if (!lastVersion) {
                             lastVersion = "0.0.0"
@@ -82,7 +82,7 @@ pipeline {
             script {
                 if (env.CHANGE_BRANCH?.startsWith('rc')) { 
                     echo "Attempting to merge PR ${env.CHANGE_ID} into master..."
-                    def commitHash = sh(script: "git rev-parse HEAD~1", returnStdout: true).trim() || null
+                    def commitHash = sh(script: "git rev-parse HEAD~1", returnStdout: true).trim()
                     withCredentials([usernamePassword(credentialsId: 'gitea_creds', usernameVariable: 'GITEA_USER', passwordVariable: 'GITEA_PASS')]) {
                         def prId = env.CHANGE_ID
                         echo "GIT_COMMIT: ${env.GIT_COMMIT}"