From 66c5ed3961ec1e788314e0c6174d1a77033e43aa Mon Sep 17 00:00:00 2001
From: LAGNEAU Romain <romain.lagneau@inria.fr>
Date: Thu, 31 Oct 2024 15:55:13 +0100
Subject: [PATCH] [FIX] Fixing other architectures CI failure due to change of
 API

---
 .github/workflows/other-arch-isolated.yml | 18 +++++++++++-------
 .github/workflows/other-arch.yml          |  9 +++++----
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/other-arch-isolated.yml b/.github/workflows/other-arch-isolated.yml
index fae718834e..9952242d71 100644
--- a/.github/workflows/other-arch-isolated.yml
+++ b/.github/workflows/other-arch-isolated.yml
@@ -29,22 +29,22 @@ jobs:
           #   distro: bullseye
           #   target: ARMV6
           - arch: armv7
-            distro: ubuntu_latest
+            distro: ubuntu:latest
             target: ARMV7
             endianness: (Little Endian)
           - arch: aarch64
-            distro: ubuntu_latest
+            distro: ubuntu:latest
             endianness: (Little Endian)
           - arch: riscv64
-            distro: ubuntu_latest
+            distro: ubuntu:latest
             target: RISC-V
             endianness: (Little Endian)
           - arch: ppc64le
-            distro: ubuntu_latest
+            distro: ubuntu:latest
             target: POWER8
             endianness: (Little Endian)
           - arch: s390x
-            distro: ubuntu_latest
+            distro: ubuntu:latest
             target: Z13
             endianness: (Big Endian)
 
@@ -54,10 +54,14 @@ jobs:
 
     - name: Run on arch
       uses: uraimo/run-on-arch-action@v2.7.2
+      # See issue https://github.com/uraimo/run-on-arch-action/issues/155 for the explanation on the weird use of the arch and distro
+      # that resulted in error
+      # ERROR: failed to solve: ${arch}/ubuntu:latest: failed to resolve source metadata for docker.io/${arch}/ubuntu:latest: no match for platform in manifest: not found
       with:
         githubToken: ${{ github.token }}
-        arch: ${{ matrix.arch }}
-        distro: ${{ matrix.distro }}
+        arch: none
+        distro: none
+        base_image: "--platform=linux/${{ matrix.arch }} ${{ matrix.distro }}"
 
         run: |
           lscpu
diff --git a/.github/workflows/other-arch.yml b/.github/workflows/other-arch.yml
index 18ccb7c6a1..6a4d6ab9aa 100644
--- a/.github/workflows/other-arch.yml
+++ b/.github/workflows/other-arch.yml
@@ -32,14 +32,14 @@ jobs:
           #   distro: ubuntu20.04
           #   target: ARMV7
           - arch: aarch64
-            distro: ubuntu_latest
+            distro: ubuntu:latest
             target: ARMV8
             endianness: (Little Endian)
           # - arch: ppc64le
           #   distro: ubuntu20.04
           #   target: POWER8
           - arch: s390x
-            distro: ubuntu_latest
+            distro: ubuntu:latest
             target: Z13
             endianness: (Big Endian)
 
@@ -51,8 +51,9 @@ jobs:
       uses: uraimo/run-on-arch-action@v2.7.2
       with:
         githubToken: ${{ github.token }}
-        arch: ${{ matrix.arch }}
-        distro: ${{ matrix.distro }}
+        arch: none
+        distro: none
+        base_image: "--platform=linux/${{ matrix.arch }} ${{ matrix.distro }}"
 
         run: |
           lscpu