From 330da471699f95e58ba0e43b8971772998515f0c Mon Sep 17 00:00:00 2001
From: Alexey Khromov <zx@zxalexis.ru>
Date: Wed, 16 Apr 2025 06:25:22 +0300
Subject: [PATCH] alt-wf 11

---
 .gitea/workflows/alt.yaml | 26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/.gitea/workflows/alt.yaml b/.gitea/workflows/alt.yaml
index 54e6786..8f5d134 100644
--- a/.gitea/workflows/alt.yaml
+++ b/.gitea/workflows/alt.yaml
@@ -25,6 +25,8 @@ jobs:
           apt-get install -y gcc rpm-build rpmlint make python gear hasher patch rpmdevtools
       - name: Installing needed software
         run: apt-get install -y bison tcl
+      - name: Adding build user
+        run: useradd -d /builder -g users -m builder
       - name: Fetching sources
         uses: actions/checkout@v4
       - name: Getting version info
@@ -33,27 +35,31 @@ jobs:
       - name: Compressing source to tar.gz archive
         run: |
           tar -cvzf ../bforce-${{ env.BFORCE_VER }}.tar.gz -C ${{ env.GITHUB_WORKSPACE }}/..  bforce
-          cp -v ${{ env.GITHUB_WORKSPACE }}/rpm/bforce.spec ../
+          cp -v ${{ env.GITHUB_WORKSPACE }}/rpm/bforce.spec /builder/
+          chown builder /builder/bforce.spec
           echo '-------------------------------------------------------'
           pwd
-          ls ../
-          sed -i 's/^# %setup/%setup/' ../bforce.spec
+          ls /builder
+          sed -i 's/^# %setup/%setup/' /builder/bforce.spec
       - name: Building buildtree
         run: |
-          rpmdev-setuptree
-          ls . -l
-          mkdir -pv ./rpmbuild/SOURCES
-          mv ${{ env.GITHUB_WORKSPACE }}/../bforce-${{ env.BFORCE_VER }}.tar.gz ${{ env.GITHUB_WORKSPACE }}/rpmbuild/SOURCES/
+          su - builder -c "cd /builder && rpmdev-setuptree"
+          ls /builder -l
+          mkdir -pv /builder/rpmbuild/SOURCES
+          mv ${{ env.GITHUB_WORKSPACE }}/../bforce-${{ env.BFORCE_VER }}.tar.gz /builder/rpmbuild/SOURCES/
+          chown -r builder /builder/*
       - name: Building binary and source RPM
         run: |
-          rpmbuild -bb ${{ env.GITHUB_WORKSPACE }}/../bforce.spec --define "_topdir ${{ env.GITHUB_WORKSPACE }}/rpmbuild"
+          su - builder -c 'rpmbuild -bb ${{ env.GITHUB_WORKSPACE }}/../bforce.spec --define "_topdir ${{ env.GITHUB_WORKSPACE }}/rpmbuild"'
       - 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-*.pkg.tar.zst bforce
-      - name: Try to upload artifacts
+      - name: Try to upload artifacts bin
         uses: actions/upload-artifact@v3
         with:
           name: bforce-${{ env.BFORCE_VER }}-Arch
-          path: bforce
+          path: /builder/rpmbuild/RPMS
+      - name: Echo OK
+        run: echo "All OK"