From c0a0f9b50659a85e83688c152fab25529fcd359a Mon Sep 17 00:00:00 2001 From: Evan Palmer Date: Thu, 22 Aug 2024 13:21:41 -0700 Subject: [PATCH 1/3] Testing lowercase repo name for cache --- .github/workflows/docker.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml index 1d601fa..3888916 100644 --- a/.github/workflows/docker.yaml +++ b/.github/workflows/docker.yaml @@ -1,12 +1,12 @@ name: Docker on: - # Disable schedule for preliminary testing - # schedule: - # - cron: "0 17 * * 6" + schedule: + - cron: "0 17 * * 6" push: branches: - main + - bug-invalid-org-case pull_request: paths: - .docker/** @@ -114,8 +114,8 @@ jobs: ${{ steps.meta-desktop-nvidia.outputs.bake-file }} push: ${{ env.PUSH }} set: | - *.cache-from=type=registry,ref=ghcr.io/${{ github.repository }}:cache-${{ matrix.ROS_DISTRO }} - *.cache-to=type=registry,mode=max,ref=ghcr.io/${{ github.repository }}:cache-${{ matrix.ROS_DISTRO }} + *.cache-from=type=registry,ref=ghcr.io/${{ steps.lowercase-repo.outputs.repository }}:cache-${{ matrix.ROS_DISTRO }} + *.cache-to=type=registry,mode=max,ref=ghcr.io/${{ steps.lowercase-repo.outputs.repository }}:cache-${{ matrix.ROS_DISTRO }} # Pull request builds are not cached; and only built for AMD64 - if: github.event_name == 'pull_request' From 381ed23da64e69fad4271d1606139b205869ef43 Mon Sep 17 00:00:00 2001 From: Evan Palmer Date: Thu, 22 Aug 2024 13:23:43 -0700 Subject: [PATCH 2/3] Remove dev branch from workflow and fix cron schedule --- .github/workflows/docker.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml index 3888916..0926930 100644 --- a/.github/workflows/docker.yaml +++ b/.github/workflows/docker.yaml @@ -6,7 +6,6 @@ on: push: branches: - main - - bug-invalid-org-case pull_request: paths: - .docker/** From 85826e2eb7372e2d18d73af5303d1583fc325d21 Mon Sep 17 00:00:00 2001 From: Aaron Marburg Date: Thu, 22 Aug 2024 14:47:08 -0700 Subject: [PATCH 3/3] Use lowercase repo for cache-from in PR build as well. --- .github/workflows/docker.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml index 0926930..f22b6ba 100644 --- a/.github/workflows/docker.yaml +++ b/.github/workflows/docker.yaml @@ -129,5 +129,5 @@ jobs: ./docker-bake.hcl set: | *.platform=linux/amd64 - *.cache-from=type=registry,ref=ghcr.io/${{ github.repository }}:cache-${{ matrix.ROS_DISTRO }} + *.cache-from=type=registry,ref=ghcr.io/${{ steps.lowercase-repo.outputs.repository }}:cache-${{ matrix.ROS_DISTRO }} *.cache-to=