Fix jazzy support

ForteFibre · Jun 5, 2024 · 2948743 · 2948743
1 parent e384717
commit 2948743
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 11 deletions.
diff --git a/.github/workflows/build-image.yml b/.github/workflows/build-image.yml
@@ -13,13 +13,15 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        target: [amd64, amd64_small, aarch64, aarch64_small]
-        rosdistro: [humble, jazzy]
-        exclude:
-          - target: amd64
-            rosdistro: jazzy
-          - target: aarch64
-            rosdistro: jazzy
+        target:
+          [
+            "amd64",
+            "aarch64",
+            "amd64_small_humble",
+            "aarch64_small_humble",
+            "amd64_small_jazzy",
+            "aarch64_small_jazzy",
+          ]
     steps:
       - uses: actions/checkout@v4
 
@@ -45,7 +47,6 @@ jobs:
           set: |
             *.cache-to=type=registry,ref=ghcr.io/fortefibre/buildroot-${{ matrix.target }}-cache,mode=max
             *.cache-from=type=registry,ref=ghcr.io/fortefibre/buildroot-${{ matrix.target }}-cache
-            *.args.ROS_DISTRO=${{ matrix.rosdistro }}
 
   pull:
     runs-on: GPU

diff --git a/buildroot/docker-bake.hcl b/buildroot/docker-bake.hcl
@@ -1,5 +1,6 @@
 group "default" {
-  targets = ["amd64", "aarch64", "amd64_small", "aarch64_small"]
+  targets = ["amd64", "aarch64", "amd64_small_humble", "aarch64_small_humble",
+    "amd64_small_jazzy", "aarch64_small_jazzy"]
 }
 
 
@@ -23,16 +24,42 @@ target "aarch64" {
     }
 }
 
-target "amd64_small" {
+target "amd64_small_humble" {
     target = "build_stage"
     dockerfile = "Dockerfile.small.amd64"
     platforms = ["linux/amd64"]
     tags = ["ghcr.io/fortefibre/buildroot-small:humble-amd64"]
+    args = {
+        ROS_DISTRO = "humble"
+    }
 }
 
-target "aarch64_small" {
+target "aarch64_small_humble" {
     target = "build_stage"
     dockerfile = "Dockerfile.small.arm64"
     platforms = ["linux/arm64"]
     tags = ["ghcr.io/fortefibre/buildroot-small:humble-aarch64"]
+    args = {
+        ROS_DISTRO = "humble"
+    }
+}
+
+target "amd64_small_jazzy" {
+    target = "build_stage"
+    dockerfile = "Dockerfile.small.amd64"
+    platforms = ["linux/amd64"]
+    tags = ["ghcr.io/fortefibre/buildroot-small:jazzy-amd64"]
+    args = {
+        ROS_DISTRO = "jazzy"
+    }
+}
+
+target "aarch64_small_jazzy" {
+    target = "build_stage"
+    dockerfile = "Dockerfile.small.arm64"
+    platforms = ["linux/arm64"]
+    tags = ["ghcr.io/fortefibre/buildroot-small:jazzy-aarch64"]
+    args = {
+        ROS_DISTRO = "jazzy"
+    }
 }