Merge pull request #71 from joshuanianji/improve-cache

Improve cache

Author: joshuanianji

.github/actions/build-base-img/action.yml

@@ -33,6 +33,18 @@ runs:
     - name: Get Latest Idris Commit SHA
       id: get-sha
       uses: ./.github/actions/get-idris-sha
+    
+    # if platforms is not equal to linux/amd64, do not cache-to (output empty string)
+    # See: https://github.com/joshuanianji/idris-2-docker/pull/71
+    - name: Calculate cache-to
+      id: calculate-cache-to
+      run: |
+        if [ "${{ inputs.platforms }}" == "linux/amd64" ]; then
+          echo "cache-to=type=gha,mode=max,scope=build-base-${{ inputs.idris-version }}" >> $GITHUB_OUTPUT
+        else
+          echo "cache-to=" >> $GITHUB_OUTPUT
+        fi
+      shell: bash
 
     - name: Build Base (versioned)
       uses: docker/build-push-action@v5
@@ -47,10 +59,13 @@ runs:
         load: ${{ inputs.load }}
         push: ${{ inputs.push }}
         labels: ${{ inputs.labels }}
-        # When doing matrix builds, we need to scope the image
-        # https://github.com/moby/buildkit/issues/2885
-        cache-from: type=gha,scope=build-base-${{ inputs.idris-version }}
-        cache-to: type=gha,mode=max,scope=build-base-${{ inputs.idris-version }}
+        # Along with caching from gha, also cache from gh registry
+        # the gha cache is limited to 10GB and I think i cause a lot of cache thrashing
+        # when I also make PRs, it seems that the cache is not shared, so I'll need to look into this
+        cache-from: |
+          type=gha,scope=build-base-${{ inputs.idris-version }}
+          type=registry,ref=ghcr.io/joshuanianji/idris-2-docker/base:${{ inputs.idris-version }}
+        cache-to: ${{ steps.calculate-cache-to.outputs.cache-to }}
 
     - name: Build Base (latest)
       uses: docker/build-push-action@v5
@@ -66,7 +81,7 @@ runs:
         load: ${{ inputs.load }}
         push: ${{ inputs.push }}
         labels: ${{ inputs.labels }}
-        # When doing matrix builds, we need to scope the image
-        # https://github.com/moby/buildkit/issues/2885
-        cache-from: type=gha,scope=build-base-${{ inputs.idris-version }}
-        cache-to: type=gha,mode=max,scope=build-base-${{ inputs.idris-version }}
+        cache-from: |
+          type=gha,scope=build-base-${{ inputs.idris-version }}
+          type=registry,ref=ghcr.io/joshuanianji/idris-2-docker/base:${{ inputs.idris-version }}
+        cache-to: ${{ steps.calculate-cache-to.outputs.cache-to }}

.github/actions/build-devcontainer-img/action.yml

@@ -41,6 +41,18 @@ runs:
       id: get-sha
       uses: ./.github/actions/get-idris-sha
 
+    # if platforms is not equal to linux/amd64, do not cache-to (output empty string)
+    # See: https://github.com/joshuanianji/idris-2-docker/pull/71
+    - name: Calculate cache-to
+      id: calculate-cache-to
+      run: |
+        if [ "${{ inputs.platforms }}" == "linux/amd64" ]; then
+          echo "cache-to=type=gha,mode=max,scope=build-devcontainer-${{ inputs.idris-version }}" >> $GITHUB_OUTPUT
+        else
+          echo "cache-to=" >> $GITHUB_OUTPUT
+        fi
+      shell: bash
+    
     - name: Build Devcontainer (versioned)
       if: ${{ inputs.idris-lsp-version != 'latest' }}
       uses: docker/build-push-action@v5
@@ -56,8 +68,10 @@ runs:
         load: ${{ inputs.load }}
         push: ${{ inputs.push }}
         labels: ${{ inputs.labels }}
-        cache-from: type=gha,scope=build-devcontainer-${{ inputs.idris-lsp-version }}
-        cache-to: type=gha,mode=max,scope=build-devcontainer-${{ inputs.idris-lsp-version }}
+        cache-from: |
+          type=gha,scope=build-devcontainer-${{ inputs.idris-version }}
+          type=registry,ref=ghcr.io/joshuanianji/idris-2-docker/devcontainer:${{ inputs.idris-version }}
+        cache-to: ${{ steps.calculate-cache-to.outputs.cache-to }}
 
     - name: Build Devcontainer (latest)
       if: ${{ inputs.idris-lsp-version == 'latest' }}
@@ -76,5 +90,7 @@ runs:
         load: ${{ inputs.load }}
         push: ${{ inputs.push }}
         labels: ${{ inputs.labels }}
-        cache-from: type=gha,scope=build-devcontainer-${{ inputs.idris-lsp-version }}
-        cache-to: type=gha,mode=max,scope=build-devcontainer-${{ inputs.idris-lsp-version }}
+        cache-from: |
+          type=gha,scope=build-devcontainer-${{ inputs.idris-version }}
+          type=registry,ref=ghcr.io/joshuanianji/idris-2-docker/devcontainer:${{ inputs.idris-version }}
+        cache-to: ${{ steps.calculate-cache-to.outputs.cache-to }}

.github/workflows/version-devcontainer-deploy.yml

@@ -58,7 +58,7 @@ jobs:
           idris-lsp-version: ${{ inputs.idris-lsp-version }}
           idris-version: ${{ inputs.idris-version }}
           push: true
-          tags: ghcr.io/${{ github.repository }}/base:${{ inputs.idris-lsp-version }}
+          tags: ghcr.io/${{ github.repository }}/devcontainer:${{ inputs.idris-version }}
           labels: ${{ steps.create-meta.outputs.labels }}
           base-tag: ghcr.io/joshuanianji/idris-2-docker/base:${{ inputs.idris-version }}
           platforms: linux/arm64,linux/amd64