From 174c9dbea6bec7261bfc8e9086ac375d1f552460 Mon Sep 17 00:00:00 2001
From: mloubout <mathias.louboutin@gmail.com>
Date: Wed, 24 Apr 2024 11:34:57 -0400
Subject: [PATCH] docker: build arm base

---
 .github/workflows/docker-bases.yml      | 18 +++++++++++++++++-
 .github/workflows/pytest-core-nompi.yml |  8 ++++----
 .github/workflows/tutorials.yml         | 18 +++++++++---------
 3 files changed, 30 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/docker-bases.yml b/.github/workflows/docker-bases.yml
index 9704b644987..8636b445967 100644
--- a/.github/workflows/docker-bases.yml
+++ b/.github/workflows/docker-bases.yml
@@ -28,6 +28,20 @@ jobs:
     runs-on: ubuntu-latest
     env:
       DOCKER_BUILDKIT: "1"
+    
+    strategy:
+        matrix:
+          name: [arm, x86]
+          include:
+            - name: arm
+              platform: linux/arm64
+              os: macos-latest
+              basename: cpu-gcc
+            
+            - name: x86
+              platform: linux/amd64
+              os: ubuntu-latest
+              basename: cpu-gcc-arm64
 
     steps:
       - name: Checkout devito
@@ -59,7 +73,9 @@ jobs:
           push: true
           target: 'gcc'
           build-args: 'arch=gcc'
-          tags: 'devitocodes/bases:cpu-gcc'
+          platform: ${{ matrix.platform }}
+          tags: 'devitocodes/bases:${{ matrix.basename }}'
+
 
 #######################################################
 ############## Intel OneApi CPU #######################
diff --git a/.github/workflows/pytest-core-nompi.yml b/.github/workflows/pytest-core-nompi.yml
index 0d8f5febf62..8dcb22e0927 100644
--- a/.github/workflows/pytest-core-nompi.yml
+++ b/.github/workflows/pytest-core-nompi.yml
@@ -36,7 +36,7 @@ jobs:
            pytest-ubuntu-py310-gcc10-noomp,
            pytest-ubuntu-py312-gcc13-omp,
            pytest-ubuntu-py39-gcc9-omp,
-           pytest-osx-py37-clang-omp,
+           pytest-osx-py312-clang-omp,
            pytest-docker-py39-gcc-omp,
            pytest-docker-py39-icx-omp
         ]
@@ -84,8 +84,8 @@ jobs:
           language: "openmp"
           sympy: "1.9"
 
-        - name: pytest-osx-py37-clang-omp
-          python-version: '3.7'
+        - name: pytest-osx-py312-clang-omp
+          python-version: '3.12'
           os: macos-latest
           arch: "clang"
           language: "C"
@@ -112,7 +112,7 @@ jobs:
           test-set: 'adjoint'
 
         exclude:
-        - name: pytest-osx-py37-clang-omp
+        - name: pytest-osx-py312-clang-omp
           set: adjoint
 
     steps:
diff --git a/.github/workflows/tutorials.yml b/.github/workflows/tutorials.yml
index c5b9088d561..a3d68e0239d 100644
--- a/.github/workflows/tutorials.yml
+++ b/.github/workflows/tutorials.yml
@@ -22,30 +22,30 @@ jobs:
     env:
       DEVITO_ARCH: "${{ matrix.compiler }}"
       DEVITO_LANGUAGE: ${{ matrix.language }}
-      PYTHON_VERSION: "3.9"
+      PYTHON_VERSION: "3.11"
 
     strategy:
       # Prevent all build to stop if a single one fails
       fail-fast: false
       matrix:
         name: [
-          tutos-ubuntu-gcc-py39,
-          tutos-osx-clang-py39,
-          tutos-docker-gcc-py39
+          tutos-ubuntu-gcc-py311,
+          tutos-osx-clang-py311,
+          tutos-docker-gcc-py311
           ]
 
         include:
-          - name: tutos-ubuntu-gcc-py39
+          - name: tutos-ubuntu-gcc-py311
             os: ubuntu-latest
             compiler: gcc
             language: "openmp"
 
-          - name: tutos-osx-clang-py39
+          - name: tutos-osx-clang-py311
             os: macos-latest
             compiler: clang
             language: "C"
 
-          - name: tutos-docker-gcc-py39
+          - name: tutos-docker-gcc-py311
             os: ubuntu-latest
             compiler: gcc
             language: "openmp"
@@ -72,7 +72,7 @@ jobs:
 
     - name: Set run prefix
       run: |
-          if [ "${{ matrix.name }}" == 'tutos-docker-gcc-py39' ]; then
+          if [ "${{ matrix.name }}" == 'tutos-docker-gcc-py311' ]; then
               echo "RUN_CMD=docker run --rm --name testrun devito_img" >> $GITHUB_ENV
           else
               echo "RUN_CMD=" >> $GITHUB_ENV
@@ -80,7 +80,7 @@ jobs:
       id: set-run
 
     - name: Install dependencies
-      if: matrix.name != 'tutos-docker-gcc-py39'
+      if: matrix.name != 'tutos-docker-gcc-py311'
       run: |
         python -m pip install --upgrade pip
         pip install -e .[tests,extras]