From 908aef45258bbc2e426b8fd6fbfbb728553d07ff Mon Sep 17 00:00:00 2001 From: Pieter Viljoen Date: Mon, 30 Mar 2026 17:29:19 -0700 Subject: [PATCH] Update cache handling in Docker build workflows to use min mode and ignore errors Signed-off-by: Pieter Viljoen --- .github/workflows/build-base-images-task.yml | 30 ++++++++++---------- .github/workflows/build-docker-task.yml | 4 +-- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/.github/workflows/build-base-images-task.yml b/.github/workflows/build-base-images-task.yml index 9705c6e..da183b0 100644 --- a/.github/workflows/build-base-images-task.yml +++ b/.github/workflows/build-base-images-task.yml @@ -17,16 +17,16 @@ jobs: strategy: matrix: base: - - name: nx-base - dockerfile: Docker/NxBase.Dockerfile - cache_tag: docker.io/ptr727/nx-base:ubuntu-noble - tags: | - docker.io/ptr727/nx-base:ubuntu-noble - - name: nx-base-lsio - dockerfile: Docker/NxBase-LSIO.Dockerfile - cache_tag: docker.io/ptr727/nx-base-lsio:ubuntu-noble - tags: | - docker.io/ptr727/nx-base-lsio:ubuntu-noble + - name: nx-base + dockerfile: Docker/NxBase.Dockerfile + cache_tag: docker.io/ptr727/nx-base:ubuntu-noble + tags: | + docker.io/ptr727/nx-base:ubuntu-noble + - name: nx-base-lsio + dockerfile: Docker/NxBase-LSIO.Dockerfile + cache_tag: docker.io/ptr727/nx-base-lsio:ubuntu-noble + tags: | + docker.io/ptr727/nx-base-lsio:ubuntu-noble steps: @@ -57,13 +57,13 @@ jobs: context: Docker file: ${{ matrix.base.dockerfile }} platforms: linux/amd64,linux/arm64 - tags: ${{ matrix.base.tags }} - cache-from: | - type=registry,ref=${{ matrix.base.cache_tag }} + tags: ${{ matrix.base.tags }} + cache-from: | + type=registry,ref=${{ matrix.base.cache_tag }} type=gha,scope=develop-base-${{ matrix.base.name }} type=gha,scope=main-base-${{ matrix.base.name }} ${{ github.event.pull_request && format('type=gha,scope=pr-base-{0}-{1}', github.event.pull_request.number, matrix.base.name) || '' }} cache-to: | - ${{ inputs.push && (github.ref_name == 'main' || github.ref_name == 'develop') && format('type=gha,mode=max,scope={0}-base-{1}', github.ref_name, matrix.base.name) || '' }} + ${{ inputs.push && (github.ref_name == 'main' || github.ref_name == 'develop') && format('type=gha,mode=max,scope={0}-base-{1},ignore-error=true', github.ref_name, matrix.base.name) || '' }} ${{ inputs.push && (github.ref_name == 'main' || github.ref_name == 'develop') && 'type=inline' || '' }} - ${{ github.event.pull_request && !github.event.pull_request.head.repo.fork && format('type=gha,mode=max,scope=pr-base-{0}-{1}', github.event.pull_request.number, matrix.base.name) || '' }} + ${{ github.event.pull_request && !github.event.pull_request.head.repo.fork && format('type=gha,mode=max,scope=pr-base-{0}-{1},ignore-error=true', github.event.pull_request.number, matrix.base.name) || '' }} diff --git a/.github/workflows/build-docker-task.yml b/.github/workflows/build-docker-task.yml index db31739..c2f9f9d 100644 --- a/.github/workflows/build-docker-task.yml +++ b/.github/workflows/build-docker-task.yml @@ -100,5 +100,5 @@ jobs: type=gha,scope=main-${{ matrix.images.Name }} ${{ github.event.pull_request && format('type=gha,scope=pr-{0}-{1}', github.event.pull_request.number, matrix.images.Name) || '' }} cache-to: | - ${{ (github.ref_name == 'main' || github.ref_name == 'develop') && format('type=gha,mode=max,scope={0}-{1}', github.ref_name, matrix.images.Name) || '' }} - ${{ github.event.pull_request && !github.event.pull_request.head.repo.fork && format('type=gha,mode=max,scope=pr-{0}-{1}', github.event.pull_request.number, matrix.images.Name) || '' }} + ${{ (github.ref_name == 'main' || github.ref_name == 'develop') && format('type=gha,mode=min,scope={0}-{1},ignore-error=true', github.ref_name, matrix.images.Name) || '' }} + ${{ github.event.pull_request && !github.event.pull_request.head.repo.fork && format('type=gha,mode=min,scope=pr-{0}-{1},ignore-error=true', github.event.pull_request.number, matrix.images.Name) || '' }}