Refactor

Author: ValentaTomas

.github/workflows/build.yml

@@ -1,10 +1,11 @@
 name: Build Firecracker Versions
 
 on:
-  push:
-    branches: [main]
-  pull_request:
-    branches: [main]
+  workflow_call:
+    outputs:
+      versions:
+        description: "JSON array of versions that were built"
+        value: ${{ jobs.prepare.outputs.versions }}
   workflow_dispatch:
 
 jobs:
@@ -33,6 +34,32 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
+      # Set up Docker Buildx for better caching
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      # Cache Docker layers
+      - name: Cache Docker layers
+        uses: actions/cache@v4
+        with:
+          path: /tmp/.buildx-cache
+          key: docker-buildx-${{ runner.os }}-${{ matrix.version }}-${{ github.sha }}
+          restore-keys: |
+            docker-buildx-${{ runner.os }}-${{ matrix.version }}-
+            docker-buildx-${{ runner.os }}-
+
+      # Cache Cargo registry and git dependencies
+      - name: Cache Cargo
+        uses: actions/cache@v4
+        with:
+          path: |
+            ~/.cargo/registry
+            ~/.cargo/git
+          key: cargo-${{ runner.os }}-${{ matrix.version }}-${{ github.sha }}
+          restore-keys: |
+            cargo-${{ runner.os }}-${{ matrix.version }}-
+            cargo-${{ runner.os }}-
+
       - name: Build Firecracker ${{ matrix.version }}
         run: ./build.sh "${{ matrix.version }}"
 

.github/workflows/fc-versions.yml

@@ -2,14 +2,21 @@ name: FC Versions
 
 on:
   push:
+  workflow_dispatch:
 
 permissions:
   id-token: write
   contents: write
 
 jobs:
+  # Run parallel builds via reusable workflow
+  build:
+    uses: ./.github/workflows/build.yml
+
+  # Collect artifacts and publish
   publish:
-    name: Build Firecracker and upload
+    name: Collect and upload builds
+    needs: build
     runs-on: ubuntu-22.04
     steps:
       - name: Checkout repository
@@ -47,23 +54,24 @@ jobs:
       - name: Test next version
         run: echo "Next version is ${{ steps.get-version.outputs.version }}"
 
+      # Download all build artifacts
+      - name: Download all build artifacts
+        uses: actions/download-artifact@v4
+        with:
+          path: builds
+          pattern: firecracker-*
+          merge-multiple: true
+
+      - name: List downloaded builds
+        run: find builds -type f | head -20
+
       - name: Setup Service Account
+        if: github.ref_name == 'main'
         uses: google-github-actions/auth@v2
         with:
           project_id: ${{ secrets.GCP_PROJECT_ID }}
           workload_identity_provider: ${{ secrets.GCP_WORKLOAD_IDENTITY_PROVIDER }}
 
-      - name: Build firecrackers
-        run: sudo make build
-
-      - name: Upload firecrackers as artifact
-        if: github.ref_name != 'main'
-        uses: actions/upload-artifact@v4
-        with:
-          name: firecracker-${{ github.run_id }}
-          path: ./builds
-          retention-days: 7
-
       - name: Upload firecrackers to GCS
         if: github.ref_name == 'main'
         uses: "google-github-actions/upload-cloud-storage@v1"
@@ -83,7 +91,6 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
-
       - name: Prepare release assets
         if: github.ref_name == 'main'
         run: |

README.md

@@ -29,4 +29,4 @@ This project automates the building of custom Firecracker. It supports building
 
 ## License
 
-This project is licensed under the Apache License 2.0. See [LICENSE](LICENSE) for details.
+This project is licensed under the Apache License 2.0. See [LICENSE](LICENSE) for details.