From 1af858587d6d25de4d2a8de7ea650bd50a2795c1 Mon Sep 17 00:00:00 2001
From: Robin Jones <networkfusion@users.noreply.github.com>
Date: Sat, 5 Jul 2025 18:58:33 +0100
Subject: [PATCH 1/4] Update docker/build-push-action

to V6
---
 .github/workflows/devcontainer-all.yaml          | 2 +-
 .github/workflows/devcontainer-azurertos.yaml    | 2 +-
 .github/workflows/devcontainer-chibios.yaml      | 2 +-
 .github/workflows/devcontainer-esp32.yml         | 2 +-
 .github/workflows/devcontainer-freertos-nxp.yaml | 2 +-
 .github/workflows/devcontainer-ti.yaml           | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/devcontainer-all.yaml b/.github/workflows/devcontainer-all.yaml
index 6419e8cf84..42cf12f184 100644
--- a/.github/workflows/devcontainer-all.yaml
+++ b/.github/workflows/devcontainer-all.yaml
@@ -53,7 +53,7 @@ jobs:
         password: ${{ secrets.CONTAINER_BUILD_TOKEN }}
 
     - name: Build and Push Docker Image
-      uses: docker/build-push-action@v5
+      uses: docker/build-push-action@v6
       with:
         file: ${{ env.CONTAINER_SRC_FILE }}
         push: true # Will only build if this is not here
diff --git a/.github/workflows/devcontainer-azurertos.yaml b/.github/workflows/devcontainer-azurertos.yaml
index 2c88eff37f..51f1344d27 100644
--- a/.github/workflows/devcontainer-azurertos.yaml
+++ b/.github/workflows/devcontainer-azurertos.yaml
@@ -53,7 +53,7 @@ jobs:
         password: ${{ secrets.CONTAINER_BUILD_TOKEN }}
 
     - name: Build and Push Docker Image
-      uses: docker/build-push-action@v5
+      uses: docker/build-push-action@v6
       with:
         file: ${{ env.CONTAINER_SRC_FILE }}
         push: true # Will only build if this is not here
diff --git a/.github/workflows/devcontainer-chibios.yaml b/.github/workflows/devcontainer-chibios.yaml
index e7d889cb7f..810a50e6aa 100644
--- a/.github/workflows/devcontainer-chibios.yaml
+++ b/.github/workflows/devcontainer-chibios.yaml
@@ -53,7 +53,7 @@ jobs:
         password: ${{ secrets.CONTAINER_BUILD_TOKEN }}
 
     - name: Build and Push Docker Image
-      uses: docker/build-push-action@v5
+      uses: docker/build-push-action@v6
       with:
         file: ${{ env.CONTAINER_SRC_FILE }}
         push: true # Will only build if this is not here
diff --git a/.github/workflows/devcontainer-esp32.yml b/.github/workflows/devcontainer-esp32.yml
index 615fbe127e..e3ad53edb3 100644
--- a/.github/workflows/devcontainer-esp32.yml
+++ b/.github/workflows/devcontainer-esp32.yml
@@ -53,7 +53,7 @@ jobs:
         password: ${{ secrets.CONTAINER_BUILD_TOKEN }}
 
     - name: Build and Push Docker Image
-      uses: docker/build-push-action@v5
+      uses: docker/build-push-action@v6
       with:
         file: ${{ env.CONTAINER_SRC_FILE }}
         push: true # Will only build if this is not here
diff --git a/.github/workflows/devcontainer-freertos-nxp.yaml b/.github/workflows/devcontainer-freertos-nxp.yaml
index c7b9ea03df..f90797f45d 100644
--- a/.github/workflows/devcontainer-freertos-nxp.yaml
+++ b/.github/workflows/devcontainer-freertos-nxp.yaml
@@ -53,7 +53,7 @@ jobs:
         password: ${{ secrets.CONTAINER_BUILD_TOKEN }}
 
     - name: Build and Push Docker Image
-      uses: docker/build-push-action@v5
+      uses: docker/build-push-action@v6
       with:
         file: ${{ env.CONTAINER_SRC_FILE }}
         push: true # Will only build if this is not here
diff --git a/.github/workflows/devcontainer-ti.yaml b/.github/workflows/devcontainer-ti.yaml
index 54e4392b39..f002b8aae6 100644
--- a/.github/workflows/devcontainer-ti.yaml
+++ b/.github/workflows/devcontainer-ti.yaml
@@ -53,7 +53,7 @@ jobs:
         password: ${{ secrets.CONTAINER_BUILD_TOKEN }}
 
     - name: Build and Push Docker Image
-      uses: docker/build-push-action@v5
+      uses: docker/build-push-action@v6
       with:
         file: ${{ env.CONTAINER_SRC_FILE }}
         push: true # Will only build if this is not here

From bdbde286cd382152ac7b5f17e237626eb6ea5532 Mon Sep 17 00:00:00 2001
From: Robin Jones <networkfusion@users.noreply.github.com>
Date: Wed, 5 Nov 2025 16:15:55 +0000
Subject: [PATCH 2/4] Update actions/checkout to V5

---
 .github/workflows/devcontainer-all.yaml          | 2 +-
 .github/workflows/devcontainer-azurertos.yaml    | 2 +-
 .github/workflows/devcontainer-chibios.yaml      | 2 +-
 .github/workflows/devcontainer-esp32.yml         | 2 +-
 .github/workflows/devcontainer-freertos-nxp.yaml | 2 +-
 .github/workflows/devcontainer-smoketest.yaml    | 2 +-
 .github/workflows/devcontainer-ti.yaml           | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/devcontainer-all.yaml b/.github/workflows/devcontainer-all.yaml
index 066047ceca..654cb34893 100644
--- a/.github/workflows/devcontainer-all.yaml
+++ b/.github/workflows/devcontainer-all.yaml
@@ -26,7 +26,7 @@ jobs:
     steps:
 
     - name: Checkout Repository
-      uses: actions/checkout@v4
+      uses: actions/checkout@v5
       
     - name: Free Disk Space (Ubuntu)
       uses: jlumbroso/free-disk-space@main
diff --git a/.github/workflows/devcontainer-azurertos.yaml b/.github/workflows/devcontainer-azurertos.yaml
index b59c3a0c8a..75362c2b7e 100644
--- a/.github/workflows/devcontainer-azurertos.yaml
+++ b/.github/workflows/devcontainer-azurertos.yaml
@@ -26,7 +26,7 @@ jobs:
     steps:
     
     - name: Checkout Repository
-      uses: actions/checkout@v4
+      uses: actions/checkout@v5
 
     - name: Free Disk Space (Ubuntu)
       uses: jlumbroso/free-disk-space@main
diff --git a/.github/workflows/devcontainer-chibios.yaml b/.github/workflows/devcontainer-chibios.yaml
index a2f35c3218..7dca2552f1 100644
--- a/.github/workflows/devcontainer-chibios.yaml
+++ b/.github/workflows/devcontainer-chibios.yaml
@@ -26,7 +26,7 @@ jobs:
     steps:
 
     - name: Checkout Repository
-      uses: actions/checkout@v4
+      uses: actions/checkout@v5
 
     - name: Free Disk Space (Ubuntu)
       uses: jlumbroso/free-disk-space@main
diff --git a/.github/workflows/devcontainer-esp32.yml b/.github/workflows/devcontainer-esp32.yml
index fe67fd8fb0..6210d6f29b 100644
--- a/.github/workflows/devcontainer-esp32.yml
+++ b/.github/workflows/devcontainer-esp32.yml
@@ -26,7 +26,7 @@ jobs:
     steps:
 
     - name: Checkout Repository
-      uses: actions/checkout@v4
+      uses: actions/checkout@v5
 
     - name: Free Disk Space (Ubuntu)
       uses: jlumbroso/free-disk-space@main
diff --git a/.github/workflows/devcontainer-freertos-nxp.yaml b/.github/workflows/devcontainer-freertos-nxp.yaml
index 120c5d682e..a9041a4bd9 100644
--- a/.github/workflows/devcontainer-freertos-nxp.yaml
+++ b/.github/workflows/devcontainer-freertos-nxp.yaml
@@ -26,7 +26,7 @@ jobs:
     steps:
 
     - name: Checkout Repository
-      uses: actions/checkout@v4
+      uses: actions/checkout@v5
     
     - name: Free Disk Space (Ubuntu)
       uses: jlumbroso/free-disk-space@main
diff --git a/.github/workflows/devcontainer-smoketest.yaml b/.github/workflows/devcontainer-smoketest.yaml
index f425200fd2..67bd75b6f6 100644
--- a/.github/workflows/devcontainer-smoketest.yaml
+++ b/.github/workflows/devcontainer-smoketest.yaml
@@ -35,7 +35,7 @@ jobs:
       contents: read
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
         with:
           submodules: true
 
diff --git a/.github/workflows/devcontainer-ti.yaml b/.github/workflows/devcontainer-ti.yaml
index 5f8f286d24..48a89817bd 100644
--- a/.github/workflows/devcontainer-ti.yaml
+++ b/.github/workflows/devcontainer-ti.yaml
@@ -26,7 +26,7 @@ jobs:
     steps:
 
     - name: Checkout Repository
-      uses: actions/checkout@v4
+      uses: actions/checkout@v5
 
     - name: Free Disk Space (Ubuntu)
       uses: jlumbroso/free-disk-space@main

From 4325845130bdc809dcb40f204bc6475d82d1746f Mon Sep 17 00:00:00 2001
From: Robin Jones <networkfusion@users.noreply.github.com>
Date: Wed, 5 Nov 2025 16:35:18 +0000
Subject: [PATCH 3/4] Use CSV for docker tags

Suggested by code-rabbit.
---
 .github/workflows/devcontainer-all.yaml          | 4 ++--
 .github/workflows/devcontainer-azurertos.yaml    | 4 ++--
 .github/workflows/devcontainer-chibios.yaml      | 4 ++--
 .github/workflows/devcontainer-esp32.yml         | 4 ++--
 .github/workflows/devcontainer-freertos-nxp.yaml | 4 ++--
 .github/workflows/devcontainer-ti.yaml           | 4 ++--
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/devcontainer-all.yaml b/.github/workflows/devcontainer-all.yaml
index 654cb34893..03a01f87c2 100644
--- a/.github/workflows/devcontainer-all.yaml
+++ b/.github/workflows/devcontainer-all.yaml
@@ -59,6 +59,6 @@ jobs:
       with:
         file: ${{ env.CONTAINER_SRC_FILE }}
         push: true # Will only build if this is not here
-        tags: |
-          ${{ env.CONTAINER_REPO }}/${{ github.repository_owner }}/${{ env.CONTAINER_NAME }}:${{ env.GCR_VERSION }}
+        tags: >
+          ${{ env.CONTAINER_REPO }}/${{ github.repository_owner }}/${{ env.CONTAINER_NAME }}:${{ env.GCR_VERSION }},
           ${{ env.CONTAINER_REPO }}/${{ github.repository_owner }}/${{ env.CONTAINER_NAME }}:latest
diff --git a/.github/workflows/devcontainer-azurertos.yaml b/.github/workflows/devcontainer-azurertos.yaml
index 75362c2b7e..26d842ff58 100644
--- a/.github/workflows/devcontainer-azurertos.yaml
+++ b/.github/workflows/devcontainer-azurertos.yaml
@@ -59,7 +59,7 @@ jobs:
       with:
         file: ${{ env.CONTAINER_SRC_FILE }}
         push: true # Will only build if this is not here
-        tags: |
-          ${{ env.CONTAINER_REPO }}/${{ github.repository_owner }}/${{ env.CONTAINER_NAME }}:${{ env.GCR_VERSION }}
+        tags: >
+          ${{ env.CONTAINER_REPO }}/${{ github.repository_owner }}/${{ env.CONTAINER_NAME }}:${{ env.GCR_VERSION }},
           ${{ env.CONTAINER_REPO }}/${{ github.repository_owner }}/${{ env.CONTAINER_NAME }}:latest
  
\ No newline at end of file
diff --git a/.github/workflows/devcontainer-chibios.yaml b/.github/workflows/devcontainer-chibios.yaml
index 7dca2552f1..3986909984 100644
--- a/.github/workflows/devcontainer-chibios.yaml
+++ b/.github/workflows/devcontainer-chibios.yaml
@@ -59,6 +59,6 @@ jobs:
       with:
         file: ${{ env.CONTAINER_SRC_FILE }}
         push: true # Will only build if this is not here
-        tags: |
-          ${{ env.CONTAINER_REPO }}/${{ github.repository_owner }}/${{ env.CONTAINER_NAME }}:${{ env.GCR_VERSION }}
+        tags: >
+          ${{ env.CONTAINER_REPO }}/${{ github.repository_owner }}/${{ env.CONTAINER_NAME }}:${{ env.GCR_VERSION }},
           ${{ env.CONTAINER_REPO }}/${{ github.repository_owner }}/${{ env.CONTAINER_NAME }}:latest
diff --git a/.github/workflows/devcontainer-esp32.yml b/.github/workflows/devcontainer-esp32.yml
index 6210d6f29b..d0cf7f8672 100644
--- a/.github/workflows/devcontainer-esp32.yml
+++ b/.github/workflows/devcontainer-esp32.yml
@@ -59,6 +59,6 @@ jobs:
       with:
         file: ${{ env.CONTAINER_SRC_FILE }}
         push: true # Will only build if this is not here
-        tags: |
-          ${{ env.CONTAINER_REPO }}/${{ github.repository_owner }}/${{ env.CONTAINER_NAME }}:${{ env.GCR_VERSION }}
+        tags: >
+          ${{ env.CONTAINER_REPO }}/${{ github.repository_owner }}/${{ env.CONTAINER_NAME }}:${{ env.GCR_VERSION }},
           ${{ env.CONTAINER_REPO }}/${{ github.repository_owner }}/${{ env.CONTAINER_NAME }}:latest
diff --git a/.github/workflows/devcontainer-freertos-nxp.yaml b/.github/workflows/devcontainer-freertos-nxp.yaml
index a9041a4bd9..74823c93a0 100644
--- a/.github/workflows/devcontainer-freertos-nxp.yaml
+++ b/.github/workflows/devcontainer-freertos-nxp.yaml
@@ -59,6 +59,6 @@ jobs:
       with:
         file: ${{ env.CONTAINER_SRC_FILE }}
         push: true # Will only build if this is not here
-        tags: |
-          ${{ env.CONTAINER_REPO }}/${{ github.repository_owner }}/${{ env.CONTAINER_NAME }}:${{ env.GCR_VERSION }}
+        tags: >
+          ${{ env.CONTAINER_REPO }}/${{ github.repository_owner }}/${{ env.CONTAINER_NAME }}:${{ env.GCR_VERSION }},
           ${{ env.CONTAINER_REPO }}/${{ github.repository_owner }}/${{ env.CONTAINER_NAME }}:latest
diff --git a/.github/workflows/devcontainer-ti.yaml b/.github/workflows/devcontainer-ti.yaml
index 48a89817bd..101460d986 100644
--- a/.github/workflows/devcontainer-ti.yaml
+++ b/.github/workflows/devcontainer-ti.yaml
@@ -59,6 +59,6 @@ jobs:
       with:
         file: ${{ env.CONTAINER_SRC_FILE }}
         push: true # Will only build if this is not here
-        tags: |
-          ${{ env.CONTAINER_REPO }}/${{ github.repository_owner }}/${{ env.CONTAINER_NAME }}:${{ env.GCR_VERSION }}
+        tags: >
+          ${{ env.CONTAINER_REPO }}/${{ github.repository_owner }}/${{ env.CONTAINER_NAME }}:${{ env.GCR_VERSION }},
           ${{ env.CONTAINER_REPO }}/${{ github.repository_owner }}/${{ env.CONTAINER_NAME }}:latest

From 1ad251aac732d2c5202072091471a601bb28b896 Mon Sep 17 00:00:00 2001
From: Robin Jones <networkfusion@users.noreply.github.com>
Date: Wed, 5 Nov 2025 16:49:30 +0000
Subject: [PATCH 4/4] Revert "Use CSV for docker tags"

This reverts commit 4325845130bdc809dcb40f204bc6475d82d1746f.
---
 .github/workflows/devcontainer-all.yaml          | 4 ++--
 .github/workflows/devcontainer-azurertos.yaml    | 4 ++--
 .github/workflows/devcontainer-chibios.yaml      | 4 ++--
 .github/workflows/devcontainer-esp32.yml         | 4 ++--
 .github/workflows/devcontainer-freertos-nxp.yaml | 4 ++--
 .github/workflows/devcontainer-ti.yaml           | 4 ++--
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/devcontainer-all.yaml b/.github/workflows/devcontainer-all.yaml
index 03a01f87c2..654cb34893 100644
--- a/.github/workflows/devcontainer-all.yaml
+++ b/.github/workflows/devcontainer-all.yaml
@@ -59,6 +59,6 @@ jobs:
       with:
         file: ${{ env.CONTAINER_SRC_FILE }}
         push: true # Will only build if this is not here
-        tags: >
-          ${{ env.CONTAINER_REPO }}/${{ github.repository_owner }}/${{ env.CONTAINER_NAME }}:${{ env.GCR_VERSION }},
+        tags: |
+          ${{ env.CONTAINER_REPO }}/${{ github.repository_owner }}/${{ env.CONTAINER_NAME }}:${{ env.GCR_VERSION }}
           ${{ env.CONTAINER_REPO }}/${{ github.repository_owner }}/${{ env.CONTAINER_NAME }}:latest
diff --git a/.github/workflows/devcontainer-azurertos.yaml b/.github/workflows/devcontainer-azurertos.yaml
index 26d842ff58..75362c2b7e 100644
--- a/.github/workflows/devcontainer-azurertos.yaml
+++ b/.github/workflows/devcontainer-azurertos.yaml
@@ -59,7 +59,7 @@ jobs:
       with:
         file: ${{ env.CONTAINER_SRC_FILE }}
         push: true # Will only build if this is not here
-        tags: >
-          ${{ env.CONTAINER_REPO }}/${{ github.repository_owner }}/${{ env.CONTAINER_NAME }}:${{ env.GCR_VERSION }},
+        tags: |
+          ${{ env.CONTAINER_REPO }}/${{ github.repository_owner }}/${{ env.CONTAINER_NAME }}:${{ env.GCR_VERSION }}
           ${{ env.CONTAINER_REPO }}/${{ github.repository_owner }}/${{ env.CONTAINER_NAME }}:latest
  
\ No newline at end of file
diff --git a/.github/workflows/devcontainer-chibios.yaml b/.github/workflows/devcontainer-chibios.yaml
index 3986909984..7dca2552f1 100644
--- a/.github/workflows/devcontainer-chibios.yaml
+++ b/.github/workflows/devcontainer-chibios.yaml
@@ -59,6 +59,6 @@ jobs:
       with:
         file: ${{ env.CONTAINER_SRC_FILE }}
         push: true # Will only build if this is not here
-        tags: >
-          ${{ env.CONTAINER_REPO }}/${{ github.repository_owner }}/${{ env.CONTAINER_NAME }}:${{ env.GCR_VERSION }},
+        tags: |
+          ${{ env.CONTAINER_REPO }}/${{ github.repository_owner }}/${{ env.CONTAINER_NAME }}:${{ env.GCR_VERSION }}
           ${{ env.CONTAINER_REPO }}/${{ github.repository_owner }}/${{ env.CONTAINER_NAME }}:latest
diff --git a/.github/workflows/devcontainer-esp32.yml b/.github/workflows/devcontainer-esp32.yml
index d0cf7f8672..6210d6f29b 100644
--- a/.github/workflows/devcontainer-esp32.yml
+++ b/.github/workflows/devcontainer-esp32.yml
@@ -59,6 +59,6 @@ jobs:
       with:
         file: ${{ env.CONTAINER_SRC_FILE }}
         push: true # Will only build if this is not here
-        tags: >
-          ${{ env.CONTAINER_REPO }}/${{ github.repository_owner }}/${{ env.CONTAINER_NAME }}:${{ env.GCR_VERSION }},
+        tags: |
+          ${{ env.CONTAINER_REPO }}/${{ github.repository_owner }}/${{ env.CONTAINER_NAME }}:${{ env.GCR_VERSION }}
           ${{ env.CONTAINER_REPO }}/${{ github.repository_owner }}/${{ env.CONTAINER_NAME }}:latest
diff --git a/.github/workflows/devcontainer-freertos-nxp.yaml b/.github/workflows/devcontainer-freertos-nxp.yaml
index 74823c93a0..a9041a4bd9 100644
--- a/.github/workflows/devcontainer-freertos-nxp.yaml
+++ b/.github/workflows/devcontainer-freertos-nxp.yaml
@@ -59,6 +59,6 @@ jobs:
       with:
         file: ${{ env.CONTAINER_SRC_FILE }}
         push: true # Will only build if this is not here
-        tags: >
-          ${{ env.CONTAINER_REPO }}/${{ github.repository_owner }}/${{ env.CONTAINER_NAME }}:${{ env.GCR_VERSION }},
+        tags: |
+          ${{ env.CONTAINER_REPO }}/${{ github.repository_owner }}/${{ env.CONTAINER_NAME }}:${{ env.GCR_VERSION }}
           ${{ env.CONTAINER_REPO }}/${{ github.repository_owner }}/${{ env.CONTAINER_NAME }}:latest
diff --git a/.github/workflows/devcontainer-ti.yaml b/.github/workflows/devcontainer-ti.yaml
index 101460d986..48a89817bd 100644
--- a/.github/workflows/devcontainer-ti.yaml
+++ b/.github/workflows/devcontainer-ti.yaml
@@ -59,6 +59,6 @@ jobs:
       with:
         file: ${{ env.CONTAINER_SRC_FILE }}
         push: true # Will only build if this is not here
-        tags: >
-          ${{ env.CONTAINER_REPO }}/${{ github.repository_owner }}/${{ env.CONTAINER_NAME }}:${{ env.GCR_VERSION }},
+        tags: |
+          ${{ env.CONTAINER_REPO }}/${{ github.repository_owner }}/${{ env.CONTAINER_NAME }}:${{ env.GCR_VERSION }}
           ${{ env.CONTAINER_REPO }}/${{ github.repository_owner }}/${{ env.CONTAINER_NAME }}:latest