ghr cache

Author: embtom

.github/actions/prepare-builder/action.yml

@@ -1,10 +1,10 @@
 name: "Prepare builder"
-description: "Prepares the build environment for Debian packages"
+description: "Prepares build environment using Podman with GHCR caching"
 author: "embtom"
 
 inputs:
   service:
-    description: "The service that was built"
+    description: "The service in docker-compose.yml"
     required: true
 
 runs:
@@ -13,49 +13,55 @@ runs:
     - name: Checkout repository
       uses: actions/checkout@v4
 
-    # - name: Set up QEMU
-    #   uses: docker/setup-qemu-action@v3
-
     - name: Install Podman and podman-compose
       uses: ./.github/actions/setup-podman
 
-    - name: Podman images
-      id: podman-image
+    - name: Login to GHCR
       shell: bash
       run: |
-        image=$(yq -r '.services."${{ inputs.service }}".image' docker-compose.yml)
-        echo "image=${image}" >> $GITHUB_OUTPUT
-
-    - name: Load cache file
-      id: podman-cache-load
-      uses: actions/cache@v3
-      with:
-        path: podman-cache-${{ inputs.service }}.tar
-        key: podman-image-${{ inputs.service }}-${{ hashFiles('Dockerfile') }}
-
-    - name: Restore cached image (if available)
-      if: steps.podman-cache-load.outputs.cache-hit == 'true'
+        echo "${{ github.token }}" | podman login ghcr.io -u "${{ github.actor }}" --password-stdin
+
+    - name: Read image name from compose
+      id: image-name
       shell: bash
       run: |
-        echo "Loading cached Podman image..."
-        podman load -i podman-cache-${{ inputs.service }}.tar || true
-        podman images
+        IMG=$(yq -r '.services."${{ inputs.service }}".image' docker-compose.yml)
+        echo "image=${IMG}" >> $GITHUB_OUTPUT
+
+        CACHE_TAG="ghcr.io/${{ github.repository_owner }}/cache-${IMG}"
+        echo "cache=${CACHE_TAG}" >> $GITHUB_OUTPUT
 
-    - name: Prepare build environment
+    - name: Try pulling cache from GHCR
+      id: pull-cache
       shell: bash
       run: |
-        SERVICE="${{ inputs.service }}"
-        echo "SERVICE=$SERVICE"
-
-        if [ "${{ steps.podman-cache-load.outputs.cache-hit }}" == 'true' ]; then
-          echo "Cache hit: skipping podman-compose build"
+        echo "Trying to pull cache image: ${{ steps.image-name.outputs.cache }}"
+        if podman pull "${{ steps.image-name.outputs.cache }}"; then
+          echo "cache-hit=true" >> $GITHUB_OUTPUT
         else
-          podman-compose -f docker-compose.yml build "$SERVICE"
+          echo "cache-hit=false" >> $GITHUB_OUTPUT
         fi
 
-    - name: Save Podman image to cache
+    - name: Load cached image tag into local tag
+      if: steps.pull-cache.outputs.cache-hit == 'true'
+      shell: bash
+      run: |
+        podman tag "${{ steps.image-name.outputs.cache }}" \
+          "${{ steps.image-name.outputs.image }}"
+
+        echo "Loaded cached image: ${{ steps.image-name.outputs.image }}"
+
+    - name: Build image if cache miss
+      if: steps.pull-cache.outputs.cache-hit == 'false'
+      shell: bash
+      run: |
+        echo "Cache miss → building image…"
+        podman-compose -f docker-compose.yml build "${{ inputs.service }}"
+
+    - name: Push updated image to GHCR as cache
       shell: bash
       run: |
-        echo "Saving Podman image to cache..."
-        podman save -o podman-cache-${{ inputs.service }}.tar \
-          "${{ steps.podman-image.outputs.image }}"
+        podman tag "${{ steps.image-name.outputs.image }}" \
+          "${{ steps.image-name.outputs.cache }}"
+
+        podman push "${{ steps.image-name.outputs.cache }}"

.github/workflows/ci-build.yml

@@ -13,13 +13,17 @@ jobs:
       matrix:
         include:
           - platform: linux-amd64
+            arch: amd64
             runner: ubuntu-24.04
             service: builder
           - platform: linux-arm64
+            arch: arm64
             runner: ubuntu-24.04-arm
             service: builder-arm64
 
     runs-on: ${{ matrix.runner }}
+    permissions: 
+      packages: write
 
     steps:
       - name: Checkout repository
@@ -34,14 +38,6 @@ jobs:
       - name: Show parsed version
         run: echo Version=${{ steps.changelog.outputs.version }}
 
-      # - name: Set up cache for Podman
-      #   uses: actions/cache@v3
-      #   with:
-      #     path: ~/.local/share/containers/storage
-      #     key: podman-cache-${{ matrix.platform }}-${{ hashFiles('Dockerfile') }}
-      #     restore-keys: |
-      #       podman-cache-${{ matrix.platform }}-
-
       - name: Prepare build environment
         uses: ./.github/actions/prepare-builder
         with: