From b083e5b417b856cae6b7fa293de2a61bc647a35e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 12 Aug 2024 20:07:22 -0700 Subject: [PATCH 1/2] Bump docker/build-push-action from 6.5.0 to 6.6.1 (#25) Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 6.5.0 to 6.6.1. - [Release notes](https://github.com/docker/build-push-action/releases) - [Commits](https://github.com/docker/build-push-action/compare/v6.5.0...v6.6.1) --- updated-dependencies: - dependency-name: docker/build-push-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> (cherry picked from commit 474bf8ccacfb7dfa3aed3f27e056e920ae8623a9) # Conflicts: # .github/workflows/docker.yml --- .github/workflows/docker.yml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 7325f5f..72219f5 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -45,7 +45,11 @@ jobs: type=raw,value=${{ matrix.ROS_DISTRO }}-${{ github.job }} - name: Build and push Docker image +<<<<<<< HEAD uses: docker/build-push-action@v5.4.0 +======= + uses: docker/build-push-action@v6.6.1 +>>>>>>> 474bf8c (Bump docker/build-push-action from 6.5.0 to 6.6.1 (#25)) with: context: . file: .docker/Dockerfile @@ -92,7 +96,11 @@ jobs: type=raw,value=${{ matrix.ROS_DISTRO }}-${{ github.job }} - name: Build and push Docker image +<<<<<<< HEAD uses: docker/build-push-action@v5.4.0 +======= + uses: docker/build-push-action@v6.6.1 +>>>>>>> 474bf8c (Bump docker/build-push-action from 6.5.0 to 6.6.1 (#25)) with: context: . file: .docker/Dockerfile @@ -134,7 +142,11 @@ jobs: type=raw,value=${{ matrix.ROS_DISTRO }}-${{ github.job }} - name: Build and push Docker image +<<<<<<< HEAD uses: docker/build-push-action@v5.4.0 +======= + uses: docker/build-push-action@v6.6.1 +>>>>>>> 474bf8c (Bump docker/build-push-action from 6.5.0 to 6.6.1 (#25)) with: context: . file: .docker/Dockerfile @@ -175,7 +187,11 @@ jobs: type=raw,value=${{ matrix.ROS_DISTRO }}-${{ github.job }} - name: Build and push Docker image +<<<<<<< HEAD uses: docker/build-push-action@v5.4.0 +======= + uses: docker/build-push-action@v6.6.1 +>>>>>>> 474bf8c (Bump docker/build-push-action from 6.5.0 to 6.6.1 (#25)) with: context: . file: .docker/Dockerfile From 0863a4155a7c462b94366d194370487c0155d5cd Mon Sep 17 00:00:00 2001 From: Evan Palmer Date: Thu, 15 Aug 2024 11:40:25 -0700 Subject: [PATCH 2/2] Fixed merge conflicts --- .github/workflows/docker.yml | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 72219f5..c861101 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -45,11 +45,7 @@ jobs: type=raw,value=${{ matrix.ROS_DISTRO }}-${{ github.job }} - name: Build and push Docker image -<<<<<<< HEAD - uses: docker/build-push-action@v5.4.0 -======= uses: docker/build-push-action@v6.6.1 ->>>>>>> 474bf8c (Bump docker/build-push-action from 6.5.0 to 6.6.1 (#25)) with: context: . file: .docker/Dockerfile @@ -96,11 +92,7 @@ jobs: type=raw,value=${{ matrix.ROS_DISTRO }}-${{ github.job }} - name: Build and push Docker image -<<<<<<< HEAD - uses: docker/build-push-action@v5.4.0 -======= uses: docker/build-push-action@v6.6.1 ->>>>>>> 474bf8c (Bump docker/build-push-action from 6.5.0 to 6.6.1 (#25)) with: context: . file: .docker/Dockerfile @@ -142,11 +134,7 @@ jobs: type=raw,value=${{ matrix.ROS_DISTRO }}-${{ github.job }} - name: Build and push Docker image -<<<<<<< HEAD - uses: docker/build-push-action@v5.4.0 -======= uses: docker/build-push-action@v6.6.1 ->>>>>>> 474bf8c (Bump docker/build-push-action from 6.5.0 to 6.6.1 (#25)) with: context: . file: .docker/Dockerfile @@ -187,11 +175,7 @@ jobs: type=raw,value=${{ matrix.ROS_DISTRO }}-${{ github.job }} - name: Build and push Docker image -<<<<<<< HEAD - uses: docker/build-push-action@v5.4.0 -======= uses: docker/build-push-action@v6.6.1 ->>>>>>> 474bf8c (Bump docker/build-push-action from 6.5.0 to 6.6.1 (#25)) with: context: . file: .docker/Dockerfile