Merge pull request #146 from essentialkaos/develop

Version 3.4.4

Author: andyone

.github/workflows/ci.yml

@@ -22,7 +22,7 @@ jobs:
 
     steps:
       - name: Code checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Login to DockerHub
         uses: docker/login-action@v3
@@ -42,7 +42,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Check scripts with Shellcheck
         uses: essentialkaos/shellcheck-action@v1
@@ -55,7 +55,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Check dockerfiles with Hadolint
         uses: essentialkaos/hadolint-action@v1
@@ -68,7 +68,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Check spelling
         uses: crate-ci/typos@master
@@ -97,7 +97,7 @@ jobs:
           # More info about issue: https://github.com/actions/runner/issues/491
 
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         if: ${{ github.event_name == 'pull_request' }}
 
       - name: Login to DockerHub

.github/workflows/docker-push.yml

@@ -32,7 +32,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           fetch-depth: 0
 

SOURCES/libexec/build-remote.shx

@@ -320,11 +320,11 @@ remoteBuildProcess() {
 
   show ""
 
-  local has_errors dl_start grc_time packages package_name package_file
+  local exit_code has_errors dl_start grc_time packages package_name package_file
 
-  has_errors=$(tail -1 "$tmp_output" | grep -v "exit 0")
+  exit_code=$(tail -100 "$tmp_output" | grep -E '^\+' | tail -1 | grep "+ exit 0")
 
-  if [[ -z "$has_errors" ]] ; then
+  if [[ -n "$exit_code" ]] ; then
     grc_time=$(getGraceDuration "$build_start")
 
     show "Build complete! The build took $grc_time." $GREEN

SOURCES/rpmbuilder

@@ -13,7 +13,7 @@ fi
 APP="RPMBuilder"
 
 # Utility version (String)
-VER="3.4.3"
+VER="3.4.4"
 
 # Utility description (String)
 DESC="RPM package build helper"

rpmbuilder.spec

@@ -6,8 +6,8 @@
 
 Summary:    RPM package build helper
 Name:       rpmbuilder
-Version:    3.4.3
-Release:    1%{?dist}
+Version:    3.4.4
+Release:    0%{?dist}
 License:    Apache License, Version 2.0
 Group:      Development/Tools
 URL:        https://kaos.sh/rpmbuilder
@@ -58,6 +58,9 @@ install -pm 644 libexec/* %{buildroot}%{_libexecdir}/%{name}/
 ################################################################################
 
 %changelog
+* Mon Aug 11 2025 Anton Novojilov <[email protected]> - 3.4.4-0
+- Improved support of rpmbuild on EL10
+
 * Fri Aug 08 2025 Anton Novojilov <[email protected]> - 3.4.3-1
 - ncurses and perl added to dependencies