fix(.github): fix non -cuda tag names (autowarefoundation#5262)

fix no cuda tag names Signed-off-by: Yutaka Kondo <[email protected]>
1222-takeshi · Sep 20, 2024 · 0fb00f4 · 0fb00f4
1 parent 549a7f8
commit 0fb00f4
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 26 deletions.
diff --git a/.github/actions/docker-build-and-push/action.yaml b/.github/actions/docker-build-and-push/action.yaml
@@ -78,8 +78,8 @@ runs:
       with:
         images: ghcr.io/${{ github.repository_owner }}/${{ inputs.bake-target }}
         tags: |
-          type=raw,value=base${{ inputs.tag-suffix && '-' }}${{ inputs.tag-suffix }}
-          type=raw,value=base${{ inputs.tag-suffix && '-' }}${{ inputs.tag-suffix }}-${{ steps.date.outputs.date }}
+          type=raw,value=base$${{ inputs.tag-suffix }}
+          type=raw,value=base$${{ inputs.tag-suffix }}-${{ steps.date.outputs.date }}
         bake-target: docker-metadata-action-base
         flavor: |
           latest=false
@@ -90,8 +90,8 @@ runs:
       with:
         images: ghcr.io/${{ github.repository_owner }}/${{ inputs.bake-target }}
         tags: |
-          type=raw,value=core-devel${{ inputs.tag-suffix && '-' }}${{ inputs.tag-suffix }}
-          type=raw,value=core-devel${{ inputs.tag-suffix && '-' }}${{ inputs.tag-suffix }}-${{ steps.date.outputs.date }}
+          type=raw,value=core-devel${{ inputs.tag-suffix }}
+          type=raw,value=core-devel${{ inputs.tag-suffix }}-${{ steps.date.outputs.date }}
         bake-target: docker-metadata-action-core-devel
         flavor: |
           latest=false
@@ -102,8 +102,8 @@ runs:
       with:
         images: ghcr.io/${{ github.repository_owner }}/${{ inputs.bake-target }}
         tags: |
-          type=raw,value=universe-sensing-perception-devel${{ inputs.tag-suffix && '-' }}${{ inputs.tag-suffix }}
-          type=raw,value=universe-sensing-perception-devel${{ inputs.tag-suffix && '-' }}${{ inputs.tag-suffix }}-${{ steps.date.outputs.date }}
+          type=raw,value=universe-sensing-perception-devel${{ inputs.tag-suffix }}
+          type=raw,value=universe-sensing-perception-devel${{ inputs.tag-suffix }}-${{ steps.date.outputs.date }}
         bake-target: docker-metadata-action-universe-sensing-perception-devel
         flavor: |
           latest=false
@@ -114,8 +114,8 @@ runs:
       with:
         images: ghcr.io/${{ github.repository_owner }}/${{ inputs.bake-target }}
         tags: |
-          type=raw,value=universe-sensing-perception${{ inputs.tag-suffix && '-' }}${{ inputs.tag-suffix }}
-          type=raw,value=universe-sensing-perception${{ inputs.tag-suffix && '-' }}${{ inputs.tag-suffix }}-${{ steps.date.outputs.date }}
+          type=raw,value=universe-sensing-perception${{ inputs.tag-suffix }}
+          type=raw,value=universe-sensing-perception${{ inputs.tag-suffix }}-${{ steps.date.outputs.date }}
         bake-target: docker-metadata-action-universe-sensing-perception
         flavor: |
           latest=false
@@ -126,8 +126,8 @@ runs:
       with:
         images: ghcr.io/${{ github.repository_owner }}/${{ inputs.bake-target }}
         tags: |
-          type=raw,value=universe-localization-mapping-devel${{ inputs.tag-suffix && '-' }}${{ inputs.tag-suffix }}
-          type=raw,value=universe-localization-mapping-devel${{ inputs.tag-suffix && '-' }}${{ inputs.tag-suffix }}-${{ steps.date.outputs.date }}
+          type=raw,value=universe-localization-mapping-devel${{ inputs.tag-suffix }}
+          type=raw,value=universe-localization-mapping-devel${{ inputs.tag-suffix }}-${{ steps.date.outputs.date }}
         bake-target: docker-metadata-action-universe-localization-mapping-devel
         flavor: |
           latest=false
@@ -138,8 +138,8 @@ runs:
       with:
         images: ghcr.io/${{ github.repository_owner }}/${{ inputs.bake-target }}
         tags: |
-          type=raw,value=universe-localization-mapping${{ inputs.tag-suffix && '-' }}${{ inputs.tag-suffix }}
-          type=raw,value=universe-localization-mapping${{ inputs.tag-suffix && '-' }}${{ inputs.tag-suffix }}-${{ steps.date.outputs.date }}
+          type=raw,value=universe-localization-mapping${{ inputs.tag-suffix }}
+          type=raw,value=universe-localization-mapping${{ inputs.tag-suffix }}-${{ steps.date.outputs.date }}
         bake-target: docker-metadata-action-universe-localization-mapping
         flavor: |
           latest=false
@@ -150,8 +150,8 @@ runs:
       with:
         images: ghcr.io/${{ github.repository_owner }}/${{ inputs.bake-target }}
         tags: |
-          type=raw,value=universe-planning-control-devel${{ inputs.tag-suffix && '-' }}${{ inputs.tag-suffix }}
-          type=raw,value=universe-planning-control-devel${{ inputs.tag-suffix && '-' }}${{ inputs.tag-suffix }}-${{ steps.date.outputs.date }}
+          type=raw,value=universe-planning-control-devel${{ inputs.tag-suffix }}
+          type=raw,value=universe-planning-control-devel${{ inputs.tag-suffix }}-${{ steps.date.outputs.date }}
         bake-target: docker-metadata-action-universe-planning-control-devel
         flavor: |
           latest=false
@@ -162,8 +162,8 @@ runs:
       with:
         images: ghcr.io/${{ github.repository_owner }}/${{ inputs.bake-target }}
         tags: |
-          type=raw,value=universe-planning-control${{ inputs.tag-suffix && '-' }}${{ inputs.tag-suffix }}
-          type=raw,value=universe-planning-control${{ inputs.tag-suffix && '-' }}${{ inputs.tag-suffix }}-${{ steps.date.outputs.date }}
+          type=raw,value=universe-planning-control${{ inputs.tag-suffix }}
+          type=raw,value=universe-planning-control${{ inputs.tag-suffix }}-${{ steps.date.outputs.date }}
         bake-target: docker-metadata-action-universe-planning-control
         flavor: |
           latest=false
@@ -174,8 +174,8 @@ runs:
       with:
         images: ghcr.io/${{ github.repository_owner }}/${{ inputs.bake-target }}
         tags: |
-          type=raw,value=universe-devel${{ inputs.tag-suffix && '-' }}${{ inputs.tag-suffix }}
-          type=raw,value=universe-devel${{ inputs.tag-suffix && '-' }}${{ inputs.tag-suffix }}-${{ steps.date.outputs.date }}
+          type=raw,value=universe-devel${{ inputs.tag-suffix }}
+          type=raw,value=universe-devel${{ inputs.tag-suffix }}-${{ steps.date.outputs.date }}
         bake-target: docker-metadata-action-universe-devel
         flavor: |
           latest=false
@@ -186,8 +186,8 @@ runs:
       with:
         images: ghcr.io/${{ github.repository_owner }}/${{ inputs.bake-target }}
         tags: |
-          type=raw,value=universe${{ inputs.tag-suffix && '-' }}${{ inputs.tag-suffix }}
-          type=raw,value=universe${{ inputs.tag-suffix && '-' }}${{ inputs.tag-suffix }}-${{ steps.date.outputs.date }}
+          type=raw,value=universe${{ inputs.tag-suffix }}
+          type=raw,value=universe${{ inputs.tag-suffix }}-${{ steps.date.outputs.date }}
         bake-target: docker-metadata-action-universe
         flavor: |
           latest=auto

diff --git a/.github/workflows/docker-build-and-push-arm64.yaml b/.github/workflows/docker-build-and-push-arm64.yaml
@@ -31,7 +31,7 @@ jobs:
             platform: arm64
             base_image_env: base_image
             lib_dir: aarch64
-            additional-tag-suffix: cuda
+            additional-tag-suffix: -cuda
     steps:
       # https://github.com/actions/checkout/issues/211
       - name: Change permission of workspace

diff --git a/.github/workflows/docker-build-and-push.yaml b/.github/workflows/docker-build-and-push.yaml
@@ -31,7 +31,7 @@ jobs:
             platform: amd64
             base_image_env: base_image
             lib_dir: x86_64
-            additional-tag-suffix: cuda
+            additional-tag-suffix: -cuda
     steps:
       - name: Check out repository
         uses: actions/checkout@v4

diff --git a/.github/workflows/health-check-arm64.yaml b/.github/workflows/health-check-arm64.yaml
@@ -24,12 +24,10 @@ jobs:
             base_image_env: base_image
             lib_dir: aarch64
             setup-args: --no-nvidia
-            additional-tag-suffix: ""
           - name: cuda
             platform: arm64
             base_image_env: base_image
             lib_dir: aarch64
-            additional-tag-suffix: -cuda
     steps:
       # https://github.com/actions/checkout/issues/211
       - name: Change permission of workspace

diff --git a/.github/workflows/health-check.yaml b/.github/workflows/health-check.yaml
@@ -39,12 +39,10 @@ jobs:
             base_image_env: base_image
             lib_dir: x86_64
             setup-args: --no-nvidia
-            additional-tag-suffix: ""
           - name: cuda
             platform: amd64
             base_image_env: base_image
             lib_dir: x86_64
-            additional-tag-suffix: -cuda
     steps:
       - name: Check out repository
         uses: actions/checkout@v4