From 58647450a08720f9371ee73f82844903b92b2af5 Mon Sep 17 00:00:00 2001
From: mat83 <mattia.scattolin@icloud.com>
Date: Tue, 29 Oct 2024 09:49:10 +0100
Subject: [PATCH] add support for latest on main

---
 .github/workflows/docker-publish.yml | 40 +++++++++++-----------------
 1 file changed, 16 insertions(+), 24 deletions(-)

diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index e66f77a..68e35c9 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -7,7 +7,10 @@ name: Build & publish Arduino containers for Portenta-X8 board
 
 on:
   push:
-    branches: [ "next", "devel", "main" ]
+    branches:
+    - devel
+    - main
+    - next
     # Publish semver tags as releases.
     tags: [ 'arduino-*' ]
 
@@ -26,82 +29,71 @@ jobs:
         - dockerfile: ./arduino-iot-cloud-provisioning/Dockerfile
           context: ./arduino-iot-cloud-provisioning
           image: arduino/arduino-iot-cloud-provisioning
-          platforms: 'amd64,arm64'
         - dockerfile: ./arduino-ootb-python-devel/Dockerfile
           context: ./arduino-ootb-python-devel
           image: arduino/arduino-ootb-python-devel
-          platforms: 'amd64,arm64'
         - dockerfile: ./arduino-ootb-webapp/Dockerfile
           context: ./arduino-ootb-webapp
           image: arduino/arduino-ootb-webapp
-          platforms: 'amd64,arm64'
         - dockerfile: ./jupyter-lab-x8/Dockerfile
           context: ./jupyter-lab-x8
           image: arduino/jupyter-lab-x8
-          platforms: 'amd64,arm64'
         - dockerfile: ./python-rpc-serial/Dockerfile
           context: ./python-rpc-serial
           image: arduino/python-rpc-serial
-          platforms: 'amd64,arm64'
         - dockerfile: ./aws-device-cert/Dockerfile
           context: ./aws-device-cert
           image: arduino/aws-device-cert
-          platforms: 'amd64,arm64'
         - dockerfile: ./python-ble-scanner-x8/Dockerfile
           context: ./python-ble-scanner-x8
           image: arduino/python-ble-scanner-x8
-          platforms: 'arm64'
         - dockerfile: ./python-rpc-sensors/Dockerfile
           context: ./python-rpc-sensors
           image: arduino/python-rpc-sensors
-          platforms: 'arm64'
     permissions:
       contents: read
       packages: write
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
-    # Add support for more platforms with QEMU (optional)
-    # https://github.com/docker/setup-qemu-action
+    # Add support for more platforms with QEMU
     - name: Set up QEMU
-      uses: docker/setup-qemu-action@v2
+      uses: docker/setup-qemu-action@v3
       with:
-        platforms: ${{ matrix.platforms }}
+        platforms: arm64
 
-    # Workaround: https://github.com/docker/build-push-action/issues/461
     - name: Setup Docker buildx
-      uses: docker/setup-buildx-action@79abd3f86f79a9d68a23c75a09a9a85889262adf
+      uses: docker/setup-buildx-action@v3
 
-    # Login against a Docker registry
-    # https://github.com/docker/login-action
     - name: Log into registry ${{ env.REGISTRY }}
-      uses: docker/login-action@28218f9b04b4f3f62068d7b6ce6ca5b26e35336c
+      uses: docker/login-action@v3
       with:
         registry: ${{ env.REGISTRY }}
         username: ${{ secrets.DOCKER_USER }}
         password: ${{ secrets.DOCKER_PASSWORD }}
 
     # Extract metadata (tags, labels) for Docker
-    # https://github.com/docker/metadata-action
     - name: Extract Docker metadata
       id: meta
-      uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38
+      uses: docker/metadata-action@v5
       with:
+        tags: |
+          # set latest tag for default branch
+          type=raw,value=latest,enable={{is_default_branch}}
         images: ${{ matrix.image }}
 
     # Build and push Docker image with Buildx (don't push on PR)
-    # https://github.com/docker/build-push-action
     - name: Build and push Docker image
       id: build-and-push
-      uses: docker/build-push-action@ac9327eae2b366085ac7f6a2d02df8aa8ead720a
+      uses: docker/build-push-action@v6
       with:
         context: ${{ matrix.context }}
         file: ${{ matrix.dockerfile }}
         push: true
         tags: ${{ steps.meta.outputs.tags }}
         labels: ${{ steps.meta.outputs.labels }}
-        platforms: ${{ matrix.platforms }}
+        platforms: arm64
         cache-from: type=gha
         cache-to: type=gha,mode=max