From 12c77e1a495746b2278150b7cb8fe3c4bd016dd7 Mon Sep 17 00:00:00 2001
From: Stefan Seefeld <stefan@seefeld.name>
Date: Tue, 14 May 2024 17:14:42 +0200
Subject: [PATCH] Upgrade CI build platforms.

---
 .github/workflows/test-osx.yml     | 11 ++++++-----
 .github/workflows/test-ubuntu.yml  |  6 +++---
 .github/workflows/test-windows.yml |  6 +++---
 src/faber/tools/clang.py           |  4 ++--
 src/faber/tools/gcc.py             |  4 ++--
 5 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/test-osx.yml b/.github/workflows/test-osx.yml
index 2871b8f46..95a7559d6 100644
--- a/.github/workflows/test-osx.yml
+++ b/.github/workflows/test-osx.yml
@@ -9,16 +9,16 @@ on:
 jobs:
   build:
 
-    runs-on: macOS-latest
+    runs-on: macos-latest
     strategy:
       fail-fast: false
       matrix:
-        python-version: ['3.6', '3.7', '3.8', '3.9']
+        python-version: ['3.8', '3.9', '3.10', '3.11']
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: setup
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v5
       with:
         python-version: ${{ matrix.python-version }}
     - name: prerequisites
@@ -31,8 +31,9 @@ jobs:
     - name: test
       run: |
         export PYTHONPATH=`pwd`/src
+        export PATH=`brew --prefix llvm`/bin:$PATH
         python -m faber.cli --info=tools cxx
-        pytest --cov=./src --compiler=native -vs
+        pytest --cov=./src --debug --compiler=native -vs
     - name: coverage
       run: |
         codecov
diff --git a/.github/workflows/test-ubuntu.yml b/.github/workflows/test-ubuntu.yml
index 1dd06ca5d..3f270b6f4 100644
--- a/.github/workflows/test-ubuntu.yml
+++ b/.github/workflows/test-ubuntu.yml
@@ -13,12 +13,12 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ['3.6', '3.7', '3.8', '3.9', 'pypy-3.6', 'pypy-3.7']
+        python-version: ['3.8', '3.9', '3.10', '3.11', 'pypy-3.8', 'pypy-3.9']
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: setup
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v5
       with:
         python-version: ${{ matrix.python-version }}
     - name: prerequisites
diff --git a/.github/workflows/test-windows.yml b/.github/workflows/test-windows.yml
index 7dad5667f..54499ca7b 100644
--- a/.github/workflows/test-windows.yml
+++ b/.github/workflows/test-windows.yml
@@ -13,12 +13,12 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ['3.6', '3.7', '3.8', '3.9']
+        python-version: ['3.8', '3.9', '3.10', '3.11']
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: setup
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v5
       with:
         python-version: ${{ matrix.python-version }}
     - name: prerequisites
diff --git a/src/faber/tools/clang.py b/src/faber/tools/clang.py
index 751cb1f82..8bc469960 100644
--- a/src/faber/tools/clang.py
+++ b/src/faber/tools/clang.py
@@ -19,13 +19,13 @@
 
 # known architectures for each machine type
 marchs = dict(x86_64=['x86_64', 'x86'],
-              arm=['eabi'],
+              arm64=['arm64'],
               w64=['w64', 'w32'])
 
 # compiler flags per architecture
 arch_flags = dict(x86_64=['-m64'],
                   x86=['-m32'],
-                  eabi=[],
+                  arm64=[],
                   w64=['-m64'],
                   w32=['-m32'])
 
diff --git a/src/faber/tools/gcc.py b/src/faber/tools/gcc.py
index d009f0eed..4117108b0 100644
--- a/src/faber/tools/gcc.py
+++ b/src/faber/tools/gcc.py
@@ -19,13 +19,13 @@
 
 # known architectures for each machine type
 marchs = dict(x86_64=['x86_64', 'x86'],
-              arm=['eabi'],
+              arm64=['arm64'],
               w64=['w64', 'w32'])
 
 # compiler flags per architecture
 arch_flags = dict(x86_64=['-m64'],
                   x86=['-m32'],
-                  eabi=[],
+                  arm64=[],
                   w64=['-m64'],
                   w32=['-m32'])