From 4ebd4e75ad71292203b5053f98934b6c4932038c Mon Sep 17 00:00:00 2001
From: Ramon Roche <mrpollo@gmail.com>
Date: Fri, 9 Aug 2024 10:08:16 -0700
Subject: [PATCH] ci: use the proper containers and job names

---
 .github/workflows/build_all_targets.yml |  2 +-
 Tools/generate_board_targets_json.py    | 22 +++++++++++++++++++---
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build_all_targets.yml b/.github/workflows/build_all_targets.yml
index c4f51decd2..33835174b1 100644
--- a/.github/workflows/build_all_targets.yml
+++ b/.github/workflows/build_all_targets.yml
@@ -17,11 +17,11 @@ jobs:
     - uses: actions/checkout@v1
       with:
         token: ${{ secrets.ACCESS_TOKEN }}
-
     - id: set-matrix
       run: echo "::set-output name=matrix::$(./Tools/generate_board_targets_json.py --group)"
 
   setup:
+    name: ${{ matrix.group }}
     runs-on: self-hosted
     needs: group_targets
     strategy:
diff --git a/Tools/generate_board_targets_json.py b/Tools/generate_board_targets_json.py
index b1948c20d2..6562e93d65 100755
--- a/Tools/generate_board_targets_json.py
+++ b/Tools/generate_board_targets_json.py
@@ -139,36 +139,52 @@ if args.pretty:
 if (args.group):
     final_groups = []
     temp_group = []
+    group_number = {}
     last_man = ''
     last_arch = ''
     for arch in grouped_targets:
+        if(last_arch == ''):
+            last_arch = arch
+        if(arch not in group_number):
+                group_number[arch] = 0
+
         if(last_arch != arch and len(temp_group) > 0):
+
+            group_name = arch + "-" + str(group_number[arch])
             final_groups.append({
                 "container": grouped_targets[arch]['container'],
                 "targets": comma_targets(temp_group),
-                'arch': last_arch
+                "arch": arch,
+                "group": group_name
             })
             last_arch = arch
+            group_number[arch] += 1
             temp_group = []
         for man in grouped_targets[arch]['manufacturers']:
             for tar in grouped_targets[arch]['manufacturers'][man]:
                 if(last_man != man):
                     if(len(grouped_targets[arch]['manufacturers'][man]) > 10):
+                        group_name = arch + "-" + man
                         last_man = man
                         final_groups.append({
                             "container": grouped_targets[arch]['container'],
                             "targets": comma_targets(grouped_targets[arch]['manufacturers'][man]),
-                            'arch': arch
+                            "arch": arch,
+                            "group": group_name
                         })
                     else:
                         temp_group.append(tar)
 
             if(len(temp_group) > 15):
+                group_name = arch + "-" + str(group_number[arch])
                 final_groups.append({
                     "container": grouped_targets[arch]['container'],
                     "targets": comma_targets(temp_group),
-                    'arch': arch
+                    "arch": arch,
+                    "group": group_name
                 })
+                last_arch = arch
+                group_number[arch] += 1
                 temp_group = []
     print(json.dumps({ "include": final_groups }, **extra_args))
 else: