From 230fde63ef407a4e6e949eb4550f008e767b9675 Mon Sep 17 00:00:00 2001
From: Nadezhda Fedorova <fedor@altlinux.org>
Date: Wed, 6 Nov 2024 16:32:19 +0300
Subject: [PATCH] rework building workflow

---
 .gitea/workflows/building.yaml | 43 ++++++++++++++++++++++++++--------
 1 file changed, 33 insertions(+), 10 deletions(-)

diff --git a/.gitea/workflows/building.yaml b/.gitea/workflows/building.yaml
index 38630b0..f0ba9e1 100644
--- a/.gitea/workflows/building.yaml
+++ b/.gitea/workflows/building.yaml
@@ -5,7 +5,7 @@ on:
       - 'build*'
 
 jobs:
-  building-x86:
+  building-x86-container:
     runs-on: alt-sisyphus
     steps:
       - name: Configure ssh
@@ -27,13 +27,36 @@ jobs:
       - name: Update building script from git
         run: |
           ssh builder 'cd cloud-build && git fetch origin && git pull -f origin configs --rebase'          
-      - name: Run script for x86
+      - name: Run script for containers on x86
         run: |
           ssh builder 'cd cloud-build && ./cloud-build.py -c ./configs/cb-ve-x86.yaml \
-          --stages build test sync --create-remote-dirs' 
-      - name: Run script for container x86
+          --stages build test sync --create-remote-dirs'
+
+  building-other-container:
+    runs-on: alt-sisyphus
+    steps:
+      - name: Configure ssh
         run: |
-          ssh builder 'cd cloud-build && ./cloud-build.py -c ./configs/container-x86.yaml \
+          mkdir -p ~/.ssh/
+          echo "$SSH_KEY" > ~/.ssh/builder.key
+          chmod 600 ~/.ssh/builder.key
+          cat >>~/.ssh/config <<END
+          Host builder
+            HostName $SSH_HOST
+            User $SSH_USER
+            IdentityFile ~/.ssh/builder.key
+            StrictHostKeyChecking no
+          END
+        env:
+          SSH_USER: ${{ secrets.BUILDER_SSH_USER }}
+          SSH_KEY: ${{ secrets.BUILDER_SSH_KEY }}
+          SSH_HOST: ${{ secrets.BUILDER_SSH_HOST }}
+      - name: Update building script from git
+        run: |
+          ssh builder 'cd cloud-build && git fetch origin && git pull -f origin configs --rebase'          
+      - name: Run script for containers on other arches
+        run: |
+          ssh builder 'cd cloud-build && ./cloud-build.py -c ./configs/cb-ve-other.yaml \
           --stages build test sync --create-remote-dirs'
 
   building-x86-vm:
@@ -60,7 +83,7 @@ jobs:
       - name: Update building script from git
         run: |
           ssh builder 'cd cloud-build && git fetch origin && git pull -f origin configs --rebase'
-      - name: Run script for vm
+      - name: Run script for vm x86
         run: |                                        
           ssh builder 'cd cloud-build && ./cloud-build.py -c ./configs/cb-vm.yaml \
            --stages build test sync --create-remote-dirs'                                                   
@@ -88,9 +111,9 @@ jobs:
       - name: Update building script from git                                          
         run: |                                                                         
           ssh -A abuilder "ssh builder 'cd cloud-build && git fetch origin && git pull -f origin configs --rebase'"
-      - name: Run script for aarch
+      - name: Run script for container on aarch
         run: |
-          ssh -A abuilder "ssh builder 'cd cloud-build && ./cloud-build.py -c ./configs/cb-aarch64.yaml --stages build test sync --create-remote-dirs'"
-      - name: Run script for container aarch
+          ssh -A abuilder "ssh builder 'cd cloud-build && ./cloud-build.py -c ./configs/cb-ve-aarch64.yaml --stages build test sync --create-remote-dirs'"
+      - name: Run script for vm aarch
         run: |
-          ssh -A abuilder "ssh builder 'cd cloud-build && ./cloud-build.py -c ./configs/container-aarch64.yaml --stages build test sync --create-remote-dirs'"
+          ssh -A abuilder "ssh builder 'cd cloud-build && ./cloud-build.py -c ./configs/cb-vm-aarch64.yaml --stages build test sync --create-remote-dirs'"