Refactor script locations

t2linux · Mar 3, 2023 · 910f626 · 910f626
1 parent 30b05fe
commit 910f626
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 13 deletions.
diff --git a/.github/workflows/build-packages.yml b/.github/workflows/build-packages.yml
@@ -23,7 +23,7 @@ jobs:
         run: |
           mkdir -p ~/rpmbuild
           echo "$RPM_SIGNING_KEY" > ./rpm_signing_key
-          docker run -t -v "$PWD":/repo fedora:37 /bin/bash -c "/repo/build.sh"
+          docker run -t -v "$PWD":/repo fedora:37 /bin/bash -c "/repo/build-packages.sh"
         env: 
           RPM_SIGNING_KEY: ${{ secrets.RPM_SIGNING_KEY }}
 

diff --git a/build.sh → build-packages.sh b/build.sh → build-packages.sh
@@ -10,9 +10,9 @@ echo -e "%_signature gpg\n%_gpg_name T2Linux Fedora" > ~/.rpmmacros
 
 echo "=====BUILDING====="
 rpmdev-setuptree
-/repo/build/python-blivet.sh
-/repo/build/t2linux-fedora.sh
-/repo/build/kernel.sh
+/repo/scripts/python-blivet.sh
+/repo/scripts/t2linux-fedora.sh
+/repo/scripts/kernel.sh
 rpm --addsign /root/rpmbuild/RPMS/x86_64/*.rpm
 
 # Copy artifacts to shared volume

diff --git a/build/t2linux-fedora.sh b/build/t2linux-fedora.sh
diff --git a/build-spec.sh → scripts/build-rpm-from-repo.sh b/build-spec.sh → scripts/build-rpm-from-repo.sh
diff --git a/build/kernel.sh → scripts/kernel.sh b/build/kernel.sh → scripts/kernel.sh
diff --git a/build/python-blivet.sh → scripts/python-blivet.sh b/build/python-blivet.sh → scripts/python-blivet.sh
@@ -4,4 +4,4 @@ cd /root/rpmbuild/SPECS
 
 echo "=====BUILDING====="
 cd /root/rpmbuild/SPECS
-/repo/build-spec.sh /repo python-blivet python-blivet-3.5.0-1.fc37
+/repo/scripts/build-rpm-from-repo.sh /repo python-blivet python-blivet-3.5.0-1.fc37
diff --git a/scripts/t2linux-fedora.sh b/scripts/t2linux-fedora.sh
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+cd /root/rpmbuild/SPECS
+
+echo "=====BUILDING====="
+cd /root/rpmbuild/SPECS
+/repo/scripts/build-rpm-from-repo.sh /repo t2linux-config
+/repo/scripts/build-rpm-from-repo.sh /repo t2linux-repo