From 504bc7df84171b42bf5899460159672950b2b8cf Mon Sep 17 00:00:00 2001
From: yuobrezkov <yurakirin9545@gmail.com>
Date: Wed, 22 Jan 2025 18:27:06 +0300
Subject: [PATCH] Changed version getting

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

diff --git a/Jenkinsfile b/Jenkinsfile
index fb128d2..57f612f 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -72,8 +72,7 @@ pipeline {
                     def targetDirAmd = "${env.WORKSPACE}/${env.CHANGE_BRANCH}/amd64"
                     def targetDirRisc = "${env.WORKSPACE}/${env.CHANGE_BRANCH}/riscv64"
                     def packageName = "noxis"
-                    def version = sh(script: "git describe --tags --always", returnStdout: true).trim()
-                    def createDebPackage = { arch, binDir, targetDir, installSize ->
+                    def version = sh(script: "git describe --tags --always $(git rev-list --tags --max-count=1 --branches=rc)", returnStdout: true).trim()                    def createDebPackage = { arch, binDir, targetDir, installSize ->
                         echo "Creating deb package for ${arch}..."
 
                         sh """
@@ -175,8 +174,8 @@ EOF
 
                         echo "Uploading deb packages using sshPut..."
 
-                        sshPut remote: remote, from: "${env.WORKSPACE}/rc/amd64", into: "/home/user/repo/debs/"
-                        sshPut remote: remote, from: "${env.WORKSPACE}/rc/riscv64", into: "/home/user/repo/debs/"
+                        sshPut remote: remote, from: "${env.WORKSPACE}/rc/amd64/*", into: "/home/user/repo/debs/"
+                        sshPut remote: remote, from: "${env.WORKSPACE}/rc/riscv64/*", into: "/home/user/repo/debs/"
 
                         echo "Running repository update commands via sshCommand..."