Merged both RPM building actions

wlrfx · May 4, 2024 · cda41ac · cda41ac
1 parent ed370d8
commit cda41ac
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 15 deletions.
diff --git a/.github/workflows/copr_build.yml b/.github/workflows/copr_build.yml
@@ -15,12 +15,7 @@ on:
 
 jobs:
   RPM-build:
-    strategy:
-      fail-fast: false
-      matrix:
-        pkgname: [ swayfx, scenefx ]
-
-    name: Test PKGBUILD ${{matrix.pkgname}}
+    name: Build RPM swayfx
     container: fedora:latest
     runs-on: ubuntu-latest
     steps:
@@ -33,18 +28,39 @@ jobs:
         with:
           fetch-depth: 0
 
-      - name: Download RPM Spec sources
+      - name: SceneFX Download RPM Spec sources
+        run: |
+          cd COPR/scenefx
+          spectool -g ./scenefx.rpkg.spec
+
+      - name: SceneFX Install build dependencies
+        run: |
+          cd COPR/scenefx
+          dnf -y builddep ./scenefx.rpkg.spec
+
+      - name: SceneFX Build RPM
+        run: |
+          cd COPR/scenefx
+          mkdir -p out
+          rpkg local --out `pwd`/out
+
+      - name: SceneFX Install RPMs
+        run: |
+          cd COPR/scenefx
+          dnf -y install ./out/**/*.rpm
+
+      - name: SwayFX Download RPM Spec sources
         run: |
-          cd COPR/${{matrix.pkgname}}
-          spectool -g ./${{matrix.pkgname}}.rpkg.spec
+          cd COPR/swayfx
+          spectool -g ./swayfx.rpkg.spec
 
-      - name: Install build dependencies
+      - name: SwayFX Install build dependencies
         run: |
-          cd COPR/${{matrix.pkgname}}
-          dnf -y builddep ./${{matrix.pkgname}}.rpkg.spec
+          cd COPR/swayfx
+          dnf -y builddep ./swayfx.rpkg.spec
 
-      - name: Build RPM
+      - name: SwayFX Build RPM
         run: |
-          cd COPR/${{matrix.pkgname}}
+          cd COPR/swayfx
           mkdir -p out
           rpkg local --out `pwd`/out
diff --git a/.github/workflows/copr_upload.yml b/.github/workflows/copr_upload.yml
@@ -18,7 +18,6 @@ jobs:
 
     container: fedora:latest
     runs-on: ubuntu-latest
-    needs: RPM-build
     steps:
       - name: Install API token for copr-cli
         env: