feat: Use a modular build system

.github/workflows/build-packages.yml

@@ -40,7 +40,7 @@ jobs:
         if: startsWith(github.ref, 'refs/tags/')
         run: |
           mkdir /tmp/repo
-          docker run -t -v "$PWD":/repo -v "/tmp/repo":/tmp/repo  fedora:37 /bin/bash -c "/repo/repo/build-repo.sh"
+          docker run -t -v "$PWD":/repo -v "/tmp/repo":/tmp/repo  fedora:37 /bin/bash -c "/repo/build-repo.sh"
           cp -r /tmp/repo ./deploy
 
       - name: Upload

.github/workflows/update-repo.yml

@@ -19,7 +19,7 @@ jobs:
       - name: Update repo
         run: |
           mkdir /tmp/repo
-          docker run -t -v "$PWD":/repo -v "/tmp/repo":/tmp/repo  fedora:37 /bin/bash -c "/repo/repo/build-repo.sh"
+          docker run -t -v "$PWD":/repo -v "/tmp/repo":/tmp/repo  fedora:37 /bin/bash -c "/repo/build-repo.sh"
           cp -r /tmp/repo ./deploy
 
       - name: Upload

build-spec.sh

@@ -0,0 +1,23 @@
+#!/usr/bin/env bash
+
+# Location of sources/ and specs/
+# Sources are in $BASE_DIR/sources/$PACKAGE_NAME
+BASE_DIR=$1
+
+# Name of spec file without the extension
+# EXAMPLE: foo.spec -> foo
+PACKAGE_NAME=$2
+
+cd /root/rpmbuild/SPECS
+
+echo "=====PREPARING SOURCES====="
+cp "$BASE_DIR"/specs/"$PACKAGE_NAME".spec /root/rpmbuild/SPECS/
+cp -r "$BASE_DIR"/sources/"$PACKAGE_NAME"/* /root/rpmbuild/SOURCES
+
+echo "=====INSTALLING DEPENDENCIES====="
+cd  /root/rpmbuild/SPECS/
+dnf -y builddep "$PACKAGE_NAME".spec
+
+echo "=====BUILDING PACKAGE====="
+cd /root/rpmbuild/SPECS/
+rpmbuild -bb "$PACKAGE_NAME".spec

build.sh

@@ -5,7 +5,6 @@ dnf install -y koji fedora-packager git curl pesign rpmdevtools rpm-sign rpm-bui
 
 echo "=====IMPORTING KEYS====="
 gpg --import /repo/rpm_signing_key
-rpm --import /repo/repo/t2linux-fedora.pub
 rm -rfv /repo/rpm_signing_key
 echo -e "%_signature gpg\n%_gpg_name T2Linux Fedora" > ~/.rpmmacros
 

package-scripts/build-dist.sh

@@ -2,15 +2,7 @@
 
 cd /root/rpmbuild/SPECS
 
-echo "=====EXTRACTING SOURCES====="
-mv /repo/specs/t2linux-*.spec /root/rpmbuild/SPECS/
-cp /repo/repo/* /root/rpmbuild/SOURCES
-
-echo "=====PREPARING SOURCES====="
-cd /root/rpmbuild/SPECS 
-dnf -y builddep t2linux-*.spec
-
 echo "=====BUILDING====="
 cd /root/rpmbuild/SPECS
-rpmbuild -bb ./t2linux-config.spec
-rpmbuild -bb ./t2linux-repo.spec
+/repo/build-spec.sh /repo t2linux-config
+/repo/build-spec.sh /repo t2linux-repo