fix rebase

Signed-off-by: Yutaka Kondo <[email protected]>

.github/actions/docker-build-and-push/action.yaml

@@ -100,7 +100,6 @@ runs:
  flavor: |
  latest=false
 
-<<<<<<< HEAD
  - name: Docker meta for autoware:universe-sensing-perception-devel-cuda
  id: meta-universe-sensing-perception-devel-cuda
  uses: docker/metadata-action@v5
@@ -113,8 +112,6 @@ runs:
  flavor: |
  latest=false
 
-=======
->>>>>>> 3f6461b (Revert "integrate")
  - name: Docker meta for autoware:universe-sensing-perception
  id: meta-universe-sensing-perception
  uses: docker/metadata-action@v5
@@ -127,7 +124,6 @@ runs:
  flavor: |
  latest=false
 
-<<<<<<< HEAD
  - name: Docker meta for autoware:universe-sensing-perception-cuda
  id: meta-universe-sensing-perception-cuda
  uses: docker/metadata-action@v5
@@ -140,8 +136,6 @@ runs:
  flavor: |
  latest=false
 
-=======
->>>>>>> 3f6461b (Revert "integrate")
  - name: Docker meta for autoware:universe-localization-mapping-devel
  id: meta-universe-localization-mapping-devel
  uses: docker/metadata-action@v5
@@ -226,7 +220,6 @@ runs:
  flavor: |
  latest=false
 
-<<<<<<< HEAD
  - name: Docker meta for autoware:universe-devel-cuda
  id: meta-universe-devel-cuda
  uses: docker/metadata-action@v5
@@ -239,8 +232,6 @@ runs:
  flavor: |
  latest=false
 
-=======
->>>>>>> 3f6461b (Revert "integrate")
  - name: Docker meta for autoware:universe
  id: meta-universe
  uses: docker/metadata-action@v5
@@ -253,7 +244,6 @@ runs:
  flavor: |
  latest=auto
 
-<<<<<<< HEAD
  - name: Docker meta for autoware:universe-cuda
  id: meta-universe-cuda
  uses: docker/metadata-action@v5
@@ -266,9 +256,7 @@ runs:
  flavor: |
  latest=auto
 
-=======
->>>>>>> 3f6461b (Revert "integrate")
- - name: Login to Docker Hub
+ - name: Login to GitHub Container Registry
  uses: docker/login-action@v3
  with:
  registry: ghcr.io
@@ -284,15 +272,19 @@ runs:
  ${{ steps.meta-base.outputs.bake-file }}
  ${{ steps.meta-core-devel.outputs.bake-file }}
  ${{ steps.meta-universe-sensing-perception-devel.outputs.bake-file }}
+ ${{ steps.meta-universe-sensing-perception-devel-cuda.outputs.bake-file }}
  ${{ steps.meta-universe-sensing-perception.outputs.bake-file }}
+ ${{ steps.meta-universe-sensing-perception-cuda.outputs.bake-file }}
  ${{ steps.meta-universe-localization-mapping-devel.outputs.bake-file }}
  ${{ steps.meta-universe-localization-mapping.outputs.bake-file }}
  ${{ steps.meta-universe-planning-control-devel.outputs.bake-file }}
  ${{ steps.meta-universe-planning-control.outputs.bake-file }}
  ${{ steps.meta-universe-vehicle-system-devel.outputs.bake-file }}
  ${{ steps.meta-universe-vehicle-system.outputs.bake-file }}
  ${{ steps.meta-universe-devel.outputs.bake-file }}
+ ${{ steps.meta-universe-devel-cuda.outputs.bake-file }}
  ${{ steps.meta-universe.outputs.bake-file }}
+ ${{ steps.meta-universe-cuda.outputs.bake-file }}
  provenance: false
  set: |
  ${{ inputs.build-args }}

.github/workflows/health-check.yaml

@@ -26,7 +26,7 @@ jobs:
 
  docker-build:
  needs: load-env
- runs-on: buildjet-16vcpu-ubuntu-2204
+ runs-on: ubuntu-22.04
  strategy:
  fail-fast: false
  steps:

docker/docker-bake.hcl

@@ -3,31 +3,39 @@ group "default" {
  "base",
  "core-devel",
  "universe-sensing-perception-devel",
+ "universe-sensing-perception-devel-cuda",
  "universe-sensing-perception",
+ "universe-sensing-perception-cuda",
  "universe-localization-mapping-devel",
  "universe-localization-mapping",
  "universe-planning-control-devel",
  "universe-planning-control",
  "universe-vehicle-system-devel",
  "universe-vehicle-system",
  "universe-devel",
- "universe"
+ "universe-devel-cuda",
+ "universe",
+ "universe-cuda"
  ]
 }
 
 // For docker/metadata-action
 target "docker-metadata-action-base" {}
 target "docker-metadata-action-core-devel" {}
 target "docker-metadata-action-universe-sensing-perception-devel" {}
+target "docker-metadata-action-universe-sensing-perception-devel-cuda" {}
 target "docker-metadata-action-universe-sensing-perception" {}
+target "docker-metadata-action-universe-sensing-perception-cuda" {}
 target "docker-metadata-action-universe-localization-mapping-devel" {}
 target "docker-metadata-action-universe-localization-mapping" {}
 target "docker-metadata-action-universe-planning-control-devel" {}
 target "docker-metadata-action-universe-planning-control" {}
 target "docker-metadata-action-universe-vehicle-system-devel" {}
 target "docker-metadata-action-universe-vehicle-system" {}
 target "docker-metadata-action-universe-devel" {}
+target "docker-metadata-action-universe-devel-cuda" {}
 target "docker-metadata-action-universe" {}
+target "docker-metadata-action-universe-cuda" {}
 
 target "base" {
  inherits = ["docker-metadata-action-base"]
@@ -47,12 +55,24 @@ target "universe-sensing-perception-devel" {
  target = "universe-sensing-perception-devel"
 }
 
+target "universe-sensing-perception-devel-cuda" {
+ inherits = ["docker-metadata-action-universe-sensing-perception-devel-cuda"]
+ dockerfile = "docker/Dockerfile"
+ target = "universe-sensing-perception-devel-cuda"
+}
+
 target "universe-sensing-perception" {
  inherits = ["docker-metadata-action-universe-sensing-perception"]
  dockerfile = "docker/Dockerfile"
  target = "universe-sensing-perception"
 }
 
+target "universe-sensing-perception-cuda" {
+ inherits = ["docker-metadata-action-universe-sensing-perception-cuda"]
+ dockerfile = "docker/Dockerfile"
+ target = "universe-sensing-perception-cuda"
+}
+
 target "universe-localization-mapping-devel" {
  inherits = ["docker-metadata-action-universe-localization-mapping-devel"]
  dockerfile = "docker/Dockerfile"
@@ -95,8 +115,20 @@ target "universe-devel" {
  target = "universe-devel"
 }
 
+target "universe-devel-cuda" {
+ inherits = ["docker-metadata-action-universe-devel-cuda"]
+ dockerfile = "docker/Dockerfile"
+ target = "universe-devel-cuda"
+}
+
 target "universe" {
  inherits = ["docker-metadata-action-universe"]
  dockerfile = "docker/Dockerfile"
  target = "universe"
 }
+
+target "universe-cuda" {
+ inherits = ["docker-metadata-action-universe-cuda"]
+ dockerfile = "docker/Dockerfile"
+ target = "universe-cuda"
+}