.gitea/workflows/build.yaml

@@ -6,7 +6,7 @@ on:
   workflow_dispatch:
 
 jobs:
-  build-8:
+  build:
     runs-on: almalinux-8
     container:
       image: git.query.consul/unkin/almalinux8-runnerdnd:latest
@@ -27,29 +27,5 @@ jobs:
       - name: Upload Artifacts
         uses: actions/upload-artifact@v3
         with:
-          name: rpms-8
-          path: /workspace/unkin/rpmbuilder/dist/*/*.rpm
-
-  build-9:
-    runs-on: almalinux-8
-    container:
-      image: git.query.consul/unkin/almalinux9-runnerdnd:latest
-      options: --privileged
-
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v3
-
-      - name: Build Packages
-        run: |
-          make all
-
-      - name: Show RPMs
-        run: |
-          find /workspace -type f -name "*.rpm"
-
-      - name: Upload Artifacts
-        uses: actions/upload-artifact@v3
-        with:
-          name: rpms-9
+          name: rpms
           path: /workspace/unkin/rpmbuilder/dist/*/*.rpm

.gitea/workflows/deploy.yaml

@@ -7,7 +7,7 @@ on:
   workflow_dispatch:
 
 jobs:
-  deploy-8:
+  deploy:
     runs-on: almalinux-8
     container:
       image: git.query.consul/unkin/almalinux8-runnerdnd:latest
@@ -19,10 +19,10 @@ jobs:
 
       - name: Download Artifacts
         run: |
-          mkdir -p /workspace/unkin/rpmbuilder/dist/8
+          mkdir -p /workspace/unkin/rpmbuilder/dist
           export PREVIOUS_RUN_ID=$((GITHUB_RUN_NUMBER - 1))
-          curl -L -o /workspace/rpms.zip "https://git.query.consul/${GITHUB_REPOSITORY}/actions/runs/${PREVIOUS_RUN_ID}/artifacts/rpms-8"
-          unzip /workspace/rpms.zip -d /workspace/unkin/rpmbuilder/dist/8
+          curl -L -o /workspace/rpms.zip "https://git.query.consul/${GITHUB_REPOSITORY}/actions/runs/${PREVIOUS_RUN_ID}/artifacts/rpms"
+          unzip /workspace/rpms.zip -d /workspace/unkin/rpmbuilder/dist
 
       - name: Show RPMs
         run: |
@@ -32,35 +32,6 @@ jobs:
         env:
           DRONECI_PASSWORD: ${{ secrets.DRONECI_PASSWORD }}
         run: |
-          for rpm in $(find /workspace/unkin/rpmbuilder/dist/8 -type f -name "*.rpm"); do
+          for rpm in $(find /workspace -type f -name "*.rpm"); do
             curl --user droneci:${{ secrets.DRONECI_PASSWORD }} --upload-file $rpm https://git.query.consul/api/packages/unkin/rpm/almalinux/el8/upload
           done
-
-  deploy-9:
-    runs-on: almalinux-8
-    container:
-      image: git.query.consul/unkin/almalinux9-runnerdnd:latest
-      options: --privileged
-
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v3
-
-      - name: Download Artifacts
-        run: |
-          mkdir -p /workspace/unkin/rpmbuilder/dist/9
-          export PREVIOUS_RUN_ID=$((GITHUB_RUN_NUMBER - 1))
-          curl -L -o /workspace/rpms.zip "https://git.query.consul/${GITHUB_REPOSITORY}/actions/runs/${PREVIOUS_RUN_ID}/artifacts/rpms-9"
-          unzip /workspace/rpms.zip -d /workspace/unkin/rpmbuilder/dist/9
-
-      - name: Show RPMs
-        run: |
-          find /workspace -type f -name "*.rpm"
-
-      - name: Upload RPMs to Gitea
-        env:
-          DRONECI_PASSWORD: ${{ secrets.DRONECI_PASSWORD }}
-        run: |
-          for rpm in $(find /workspace/unkin/rpmbuilder/dist/9 -type f -name "*.rpm"); do
-            curl --user droneci:${{ secrets.DRONECI_PASSWORD }} --upload-file $rpm https://git.query.consul/api/packages/unkin/rpm/almalinux/el9/upload
-          done