-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
c5c5f7f
commit 29f90ce
Showing
1 changed file
with
0 additions
and
16 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -45,11 +45,7 @@ jobs: | |
| type=raw,value=${{ matrix.ROS_DISTRO }}-${{ github.job }} | ||
| - name: Build and push Docker image | ||
| <<<<<<< HEAD | ||
| uses: docker/[email protected] | ||
| ======= | ||
| uses: docker/[email protected] | ||
| >>>>>>> 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/[email protected] | ||
| ======= | ||
| uses: docker/[email protected] | ||
| >>>>>>> 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/[email protected] | ||
| ======= | ||
| uses: docker/[email protected] | ||
| >>>>>>> 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/[email protected] | ||
| ======= | ||
| uses: docker/[email protected] | ||
| >>>>>>> 474bf8c (Bump docker/build-push-action from 6.5.0 to 6.6.1 (#25)) | ||
| with: | ||
| context: . | ||
| file: .docker/Dockerfile | ||
|
|
||