split atmel-samd instead of raspberrypi

microdev1 · microdev1 · commit 592fea682297 · 2023-02-22T20:08:13.000+05:30
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -24,9 +24,9 @@ jobs:
       build-boards: ${{ steps.set-matrix.outputs.build-boards }}
       boards-aarch: ${{ steps.set-matrix.outputs.boards-aarch }}
       boards-arm: ${{ steps.set-matrix.outputs.boards-arm }}
+      boards-atmel: ${{ steps.set-matrix.outputs.boards-atmel }}
       boards-esp: ${{ steps.set-matrix.outputs.boards-esp }}
       boards-riscv: ${{ steps.set-matrix.outputs.boards-riscv }}
-      boards-rpi: ${{ steps.set-matrix.outputs.boards-rpi }}
       cp-version: ${{ steps.set-up-submodules.outputs.version }}
     steps:
     - name: Dump GitHub context
@@ -238,6 +238,16 @@ jobs:
       boards: ${{ needs.scheduler.outputs.boards-arm }}
       cp-version: ${{ needs.scheduler.outputs.cp-version }}
 
+  atmel:
+    needs: [scheduler, mpy-cross, tests]
+    if: ${{ needs.scheduler.outputs.boards-atmel != '[]' }}
+    uses: ./.github/workflows/build-boards.yml
+    secrets: inherit
+    with:
+      platform: arm
+      boards: ${{ needs.scheduler.outputs.boards-atmel }}
+      cp-version: ${{ needs.scheduler.outputs.cp-version }}
+
   esp:
     needs: [scheduler, mpy-cross, tests]
     if: ${{ needs.scheduler.outputs.boards-esp != '[]' }}
@@ -257,13 +267,3 @@ jobs:
       platform: riscv
       boards: ${{ needs.scheduler.outputs.boards-riscv }}
       cp-version: ${{ needs.scheduler.outputs.cp-version }}
-
-  rpi:
-    needs: [scheduler, mpy-cross, tests]
-    if: ${{ needs.scheduler.outputs.boards-rpi != '[]' }}
-    uses: ./.github/workflows/build-boards.yml
-    secrets: inherit
-    with:
-      platform: arm
-      boards: ${{ needs.scheduler.outputs.boards-rpi }}
-      cp-version: ${{ needs.scheduler.outputs.cp-version }}
diff --git a/tools/ci_set_matrix.py b/tools/ci_set_matrix.py
@@ -43,14 +43,14 @@
 )
 
 PORT_TO_ARCH = {
-    "atmel-samd": "arm",
+    "atmel-samd": "atmel",
     "broadcom": "aarch",
     "cxd56": "arm",
     "espressif": "esp",
     "litex": "riscv",
     "mimxrt10xx": "arm",
     "nrf": "arm",
-    "raspberrypi": "rpi",
+    "raspberrypi": "arm",
     "stm": "arm",
 }
 
@@ -92,7 +92,7 @@ def set_output(name: str, value):
 
 
 def set_boards_to_build(build_all: bool):
-    if "mpy_cross" in last_failed_jobs or "tests" in last_failed_jobs:
+    if last_failed_jobs.get("mpy_cross") or last_failed_jobs.get("tests"):
         build_all = True
 
     # Get boards in json format
@@ -207,13 +207,12 @@ def get_settings(board):
             break
 
     # Split boards by architecture.
-    arch_to_boards = {"aarch": [], "arm": [], "esp": [], "riscv": [], "rpi": []}
+    arch_to_boards = {"aarch": [], "arm": [], "atmel": [], "esp": [], "riscv": []}
 
     # Append previously failed boards
     for arch in arch_to_boards:
-        arch_to_job = f"build-{arch}"
-        if arch_to_job in last_failed_jobs:
-            for board in last_failed_jobs[arch_to_job]:
+        if arch in last_failed_jobs:
+            for board in last_failed_jobs[arch]:
                 if not board in boards_to_build:
                     boards_to_build.append(board)
 
@@ -238,7 +237,7 @@ def get_settings(board):
 
 def set_docs_to_build(build_doc: bool):
     if not build_doc:
-        if "build-doc" in last_failed_jobs:
+        if last_failed_jobs.get("build-doc"):
             build_doc = True
         else:
             doc_pattern = re.compile(
