From c90109a0a3b4d61c793cda1ca11a59b22fe9b730 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 12 Dec 2024 10:49:42 -0800 Subject: [PATCH 1/7] Bump nanoid from 3.3.7 to 3.3.8 in /docs (#354) Bumps [nanoid](https://github.com/ai/nanoid) from 3.3.7 to 3.3.8. - [Release notes](https://github.com/ai/nanoid/releases) - [Changelog](https://github.com/ai/nanoid/blob/main/CHANGELOG.md) - [Commits](https://github.com/ai/nanoid/compare/3.3.7...3.3.8) --- updated-dependencies: - dependency-name: nanoid dependency-type: indirect ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- docs/package-lock.json | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/docs/package-lock.json b/docs/package-lock.json index 5741ac9f..c4cba4c0 100644 --- a/docs/package-lock.json +++ b/docs/package-lock.json @@ -14194,16 +14194,15 @@ } }, "node_modules/nanoid": { - "version": "3.3.7", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz", - "integrity": "sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==", + "version": "3.3.8", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.8.tgz", + "integrity": "sha512-WNLf5Sd8oZxOm+TzppcYk8gVOgP+l58xNy58D0nbUnOxOWRWvlcCV4kUF7ltmI6PsrLl/BgKEyS4mqsGChFN0w==", "funding": [ { "type": "github", "url": "https://github.com/sponsors/ai" } ], - "license": "MIT", "bin": { "nanoid": "bin/nanoid.cjs" }, From 4e46eb0f57a0b131810a7f047ec486badd622c60 Mon Sep 17 00:00:00 2001 From: Aaron Marburg Date: Thu, 12 Dec 2024 17:08:12 -0800 Subject: [PATCH 2/7] docker buildx no longer likes blank strings --- .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 bd903c86..7220a1ef 100644 --- a/.github/workflows/docker.yaml +++ b/.github/workflows/docker.yaml @@ -130,4 +130,4 @@ jobs: set: | *.platform=linux/amd64 *.cache-from=type=registry,ref=ghcr.io/${{ steps.lowercase-repo.outputs.repository }}:cache-${{ matrix.ROS_DISTRO }} - *.cache-to= + *.cache-to='' From d36f5a57c8e2338a7f1efe392b29fe5efdfdebb5 Mon Sep 17 00:00:00 2001 From: Aaron Marburg Date: Thu, 12 Dec 2024 17:11:40 -0800 Subject: [PATCH 3/7] Switch cache-from and cache-to to lists --- .github/workflows/docker.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml index 7220a1ef..f15d777f 100644 --- a/.github/workflows/docker.yaml +++ b/.github/workflows/docker.yaml @@ -113,8 +113,8 @@ jobs: ${{ steps.meta-desktop-nvidia.outputs.bake-file }} push: ${{ env.PUSH }} set: | - *.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 }} + *.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' @@ -129,5 +129,5 @@ jobs: ./docker-bake.hcl set: | *.platform=linux/amd64 - *.cache-from=type=registry,ref=ghcr.io/${{ steps.lowercase-repo.outputs.repository }}:cache-${{ matrix.ROS_DISTRO }} - *.cache-to='' + *.cache-from=[type=registry,ref=ghcr.io/${{ steps.lowercase-repo.outputs.repository }}:cache-${{ matrix.ROS_DISTRO }}] + *.cache-to=[] From 386a082d7e174e0d13b46cf4785d42cf7d887041 Mon Sep 17 00:00:00 2001 From: Aaron Marburg Date: Thu, 12 Dec 2024 17:14:55 -0800 Subject: [PATCH 4/7] Third try --- .github/workflows/docker.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml index f15d777f..c1160859 100644 --- a/.github/workflows/docker.yaml +++ b/.github/workflows/docker.yaml @@ -113,8 +113,8 @@ jobs: ${{ steps.meta-desktop-nvidia.outputs.bake-file }} push: ${{ env.PUSH }} set: | - *.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 }}] + *.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' @@ -129,5 +129,5 @@ jobs: ./docker-bake.hcl set: | *.platform=linux/amd64 - *.cache-from=[type=registry,ref=ghcr.io/${{ steps.lowercase-repo.outputs.repository }}:cache-${{ matrix.ROS_DISTRO }}] + *.cache-from=type=registry,ref=ghcr.io/${{ steps.lowercase-repo.outputs.repository }}:cache-${{ matrix.ROS_DISTRO }} *.cache-to=[] From 2cda875713612e4b48f49d297ec4fa5897e8fcf9 Mon Sep 17 00:00:00 2001 From: Aaron Marburg Date: Thu, 12 Dec 2024 17:18:37 -0800 Subject: [PATCH 5/7] Try inline cache --- .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 c1160859..b654efd9 100644 --- a/.github/workflows/docker.yaml +++ b/.github/workflows/docker.yaml @@ -130,4 +130,4 @@ jobs: set: | *.platform=linux/amd64 *.cache-from=type=registry,ref=ghcr.io/${{ steps.lowercase-repo.outputs.repository }}:cache-${{ matrix.ROS_DISTRO }} - *.cache-to=[] + *.cache-to=inline From 79c0874898aa2ce4224debf29ce3a8166ced4697 Mon Sep 17 00:00:00 2001 From: Aaron Marburg Date: Thu, 12 Dec 2024 17:25:40 -0800 Subject: [PATCH 6/7] Local exporter to /tmp?? --- .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 b654efd9..d09d4482 100644 --- a/.github/workflows/docker.yaml +++ b/.github/workflows/docker.yaml @@ -130,4 +130,4 @@ jobs: set: | *.platform=linux/amd64 *.cache-from=type=registry,ref=ghcr.io/${{ steps.lowercase-repo.outputs.repository }}:cache-${{ matrix.ROS_DISTRO }} - *.cache-to=inline + *.cache-to=local,dest=/tmp From 4df08758a89241b2547fb6209de99c6e52b92020 Mon Sep 17 00:00:00 2001 From: Aaron Marburg Date: Thu, 12 Dec 2024 17:30:46 -0800 Subject: [PATCH 7/7] Pin buildx --- .github/workflows/docker.yaml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml index d09d4482..095f22ca 100644 --- a/.github/workflows/docker.yaml +++ b/.github/workflows/docker.yaml @@ -38,6 +38,10 @@ jobs: - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 + with: + # Pin buildx to this version + # Issues with setting "*.cache-to=" below with v0.19.2 + version: v0.18.0 - if: env.PUSH == 'true' name: Log into registry @@ -130,4 +134,4 @@ jobs: set: | *.platform=linux/amd64 *.cache-from=type=registry,ref=ghcr.io/${{ steps.lowercase-repo.outputs.repository }}:cache-${{ matrix.ROS_DISTRO }} - *.cache-to=local,dest=/tmp + *.cache-to=