From e3a1f7e52e5bd72b7c91be4ef6300602f0d700cf Mon Sep 17 00:00:00 2001
From: Alexey Khromov <zx@zxalexis.ru>
Date: Sun, 13 Apr 2025 20:10:36 +0300
Subject: [PATCH] CI fx workflow 39

---
 .gitea/workflows/arch.yaml   | 8 +++++---
 .gitea/workflows/debpkg.yaml | 2 +-
 debian/changelog             | 6 ++++++
 rpm/bforce.spec              | 6 +++---
 4 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/.gitea/workflows/arch.yaml b/.gitea/workflows/arch.yaml
index ad442b2..5d78116 100644
--- a/.gitea/workflows/arch.yaml
+++ b/.gitea/workflows/arch.yaml
@@ -2,10 +2,9 @@ name: Archlinux build
 run-name: Deploy to ${{ inputs.deploy_target }} by @${{ github.actor }} 🚀
 on: [push]
 jobs:
-  if: ${{ gitea.ref_name }} == '/refs/heads/master'
   build:
     runs-on: arch-latest
-    if: ${{ github.ref }} == 'refs/head/zx' 
+    if: ${{ github.ref }} == 'refs/head/master' 
     branches:
       - 'master'
       - 'zx'
@@ -28,10 +27,13 @@ jobs:
         run: |
           su -w GITHUB_SHA,GITHUB_REF_NAME,GITHUB_REF_TYPE - builder -c makepkg
           su - builder -c "ls -la"
+      - name: Constructing artifact name and version
+        run: |
+          echo "BFORCE_VER=$(cat /builder/src/bforce/source/.version)-$(date +%Y%M%d)" >> $GITHUB_ENV
       - name: Retrieving artifact files
         run: mkdir bforce && cp /builder/bforce-r*.pkg.tar.zst bforce
       - name: Try to upload artifacts
         uses: actions/upload-artifact@v3
         with:
-          name: bforce-${{ env.GITHUB_SHA }}
+          name: bforce-${{ env.BFORCE_VER }}
           path: bforce
diff --git a/.gitea/workflows/debpkg.yaml b/.gitea/workflows/debpkg.yaml
index 017099a..e9d860d 100644
--- a/.gitea/workflows/debpkg.yaml
+++ b/.gitea/workflows/debpkg.yaml
@@ -27,7 +27,7 @@ jobs:
         uses: actions/checkout@v4
       - name: Getting version info
         run: |
-            echo "BFORCE_VER=$(cat ${{ env.GITHUB_WORKSPACE }}/source/.version)" >> $GITHUB_ENV
+            echo "BFORCE_VER=$(cat ${{ env.GITHUB_WORKSPACE }}/source/.version)-$(date +%Y%M%d)" >> $GITHUB_ENV
       - name: Building package
         continue-on-error: false
         run: |
diff --git a/debian/changelog b/debian/changelog
index 0415121..5c0cb06 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+bforce (0.26.1) UNRELEASED; urgency=medium
+
+  * Fixed for ubuntu/debian builds and CI actions
+
+ -- Alexey Khromov <zx@zxalexis.ru>  Sun, 13 Apr 2025 20:06:54 +0300
+
 bforce (0.26) UNRELEASED; urgency=medium
 
   * Fixed for IPv6 and build on amd64 and aarch64 platforms
diff --git a/rpm/bforce.spec b/rpm/bforce.spec
index 8b68bb5..c080cdf 100644
--- a/rpm/bforce.spec
+++ b/rpm/bforce.spec
@@ -1,7 +1,7 @@
 Summary: Bforce, Fidonet mailer
 Name: bforce
-Version: 0.22.8
-Release: ugenk4
+Version: 0.26.1
+Release: 0
 Copyright: GPL
 Group: Fidonet/mailer
 Source0: bforce-%{version}.%{release}.tar.gz
@@ -56,7 +56,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(550,uucp,news) /usr/bin/bfstat
 %attr(550,uucp,news) /usr/bin/nlookup
 %attr(550,uucp,news) /usr/bin/outman
-%attr(644,root,root) /usr/share/doc/bforce-0.22.8/*
+%attr(644,root,root) /usr/share/doc/bforce/*
 %dir %attr(770,uucp,news)  /var/log/bforce
 %dir %attr(770,uucp,news)  /var/spool/fido/ndl
 %attr(775,uucp,news) /var/spool/fido/bt