CI: Merge jobs

Signed-off-by: Vasiliy Doylov <nekocwd@mainlining.org>

.forgejo/workflows/build-alpine.yaml

@@ -5,13 +5,6 @@ on:
   workflow_dispatch:
 
 jobs:
-  prepare-aports:
-    name: Prepare pmaports
-    runs-on: Pmbootstrap
-    steps:
-      - name: Remove libcamera aport
-        run: rm -rf ${{env.PMB_PMAPORTS}}/temp/libcamera
-
   build:
     name: Build for ${{ matrix.info.arch }}
     runs-on: Pmbootstrap
@@ -22,6 +15,8 @@ jobs:
           - arch: x86_64
           - arch: aarch64
     steps:
+      - name: Remove libcamera aport
+        run: rm -rf ${{env.PMB_PMAPORTS}}/temp/libcamera
       - name: Check out repository code
         uses: actions/checkout@v4
       - name: Build packages
@@ -37,14 +32,7 @@ jobs:
         with:
           files: ${{steps.build.outputs.packages}}
           secret: ${{secrets.PACKAGE_TOKEN}}
-
-  clean-aports:
-    name: Clean pmaports
-    runs-on: Pmbootstrap
-    if: always()
-    needs:
-      - prepare-aports
-      - build
-    steps:
       - name: Reset pmaports changes
+        if: always()
+        continue-on-error: true
         run: git -C ${{env.PMB_PMAPORTS}} reset --hard