Test arm64 Linux runners

andre-schulz · Feb 15, 2025 · 202085d · 202085d
1 parent bc12392
commit 202085d
Showing 1 changed file with 25 additions and 13 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -2,7 +2,7 @@ name: MVE GitHub Actions CI
 
 on:
   push:
-    branches: [ "master" ]
+    branches: [ "master", "test_arm64_runners" ]
   pull_request:
     branches: [ "master" ]
 
@@ -16,18 +16,19 @@ jobs:
 
       matrix:
         platform:
-        - { name: "Ubuntu 20.04, GCC, x86_64",   os: ubuntu-20.04,     cpp_compiler: g++,     qmake_spec: linux-g++ }
-        - { name: "Ubuntu 20.04, Clang, x86_64", os: ubuntu-20.04,     cpp_compiler: clang++, qmake_spec: linux-clang }
-        - { name: "Ubuntu 22.04, GCC, arm64",    os: ubuntu-22.04-arm, cpp_compiler: g++,     qmake_spec: linux-g++ }
-        - { name: "Ubuntu 22.04, GCC, x86_64",   os: ubuntu-22.04,     cpp_compiler: g++,     qmake_spec: linux-g++ }
-        - { name: "Ubuntu 22.04, Clang, x86_64", os: ubuntu-22.04,     cpp_compiler: clang++, qmake_spec: linux-clang }
-        - { name: "Ubuntu 24.04, GCC, arm64",    os: ubuntu-24.04-arm, cpp_compiler: g++,     qmake_spec: linux-g++ }
-        - { name: "Ubuntu 24.04, Clang, arm64",  os: ubuntu-24.04-arm, cpp_compiler: clang++, qmake_spec: linux-clang }
-        - { name: "Ubuntu 24.04, GCC, x86_64",   os: ubuntu-24.04,     cpp_compiler: g++,     qmake_spec: linux-g++ }
-        - { name: "Ubuntu 24.04, Clang, x86_64", os: ubuntu-24.04,     cpp_compiler: clang++, qmake_spec: linux-clang }
-        - { name: "macOS 13, Clang, x86_64",     os: macos-13,         cpp_compiler: clang++, qmake_spec: macx-clang }
-        - { name: "macOS 14, Clang, arm64",      os: macos-14,         cpp_compiler: clang++, qmake_spec: macx-clang }
-        - { name: "macOS 15, Clang, arm64",      os: macos-15,         cpp_compiler: clang++, qmake_spec: macx-clang }
+          #        - { name: "Ubuntu 20.04, GCC, x86_64",   os: ubuntu-20.04,     cpp_compiler: g++,     qmake_spec: linux-g++ }
+          #        - { name: "Ubuntu 20.04, Clang, x86_64", os: ubuntu-20.04,     cpp_compiler: clang++, qmake_spec: linux-clang }
+          #        - { name: "Ubuntu 22.04, GCC, arm64",    os: ubuntu-22.04-arm, cpp_compiler: g++,     qmake_spec: linux-g++ }
+        - { name: "Ubuntu 22.04, Clang, arm64",  os: ubuntu-22.04-arm, cpp_compiler: clang++, qmake_spec: linux-clang }
+        #        - { name: "Ubuntu 22.04, GCC, x86_64",   os: ubuntu-22.04,     cpp_compiler: g++,     qmake_spec: linux-g++ }
+        #        - { name: "Ubuntu 22.04, Clang, x86_64", os: ubuntu-22.04,     cpp_compiler: clang++, qmake_spec: linux-clang }
+        #        - { name: "Ubuntu 24.04, GCC, arm64",    os: ubuntu-24.04-arm, cpp_compiler: g++,     qmake_spec: linux-g++ }
+        #        - { name: "Ubuntu 24.04, Clang, arm64",  os: ubuntu-24.04-arm, cpp_compiler: clang++, qmake_spec: linux-clang }
+        #        - { name: "Ubuntu 24.04, GCC, x86_64",   os: ubuntu-24.04,     cpp_compiler: g++,     qmake_spec: linux-g++ }
+        #        - { name: "Ubuntu 24.04, Clang, x86_64", os: ubuntu-24.04,     cpp_compiler: clang++, qmake_spec: linux-clang }
+        #        - { name: "macOS 13, Clang, x86_64",     os: macos-13,         cpp_compiler: clang++, qmake_spec: macx-clang }
+        #        - { name: "macOS 14, Clang, arm64",      os: macos-14,         cpp_compiler: clang++, qmake_spec: macx-clang }
+        #        - { name: "macOS 15, Clang, arm64",      os: macos-15,         cpp_compiler: clang++, qmake_spec: macx-clang }
 
     env:
       CXX: ${{ matrix.platform.cpp_compiler }}
@@ -62,6 +63,11 @@ jobs:
           zlib1g-dev
         echo "::endgroup::"
 
+        DISTRI=`grep ^NAME /etc/os-release | sed -e 's/NAME="\(.*\)"/\1/'`
+        if [[ "${DISTRI}" = "Ubuntu" ]]; then
+          sudo apt-get install clang-15
+        fi
+
     - name: Install macOS dependencies
       if: runner.os == 'macOS'
       run: |
@@ -84,10 +90,16 @@ jobs:
 
     - name: Build (U)MVE on Linux/macOS
       run: |
+        uname -a
         ${CXX} --version
         if [ "`uname`" = "Darwin" ]; then
           export NUM_CPU_CORES="`sysctl -n hw.ncpu`"
         else
+          lscpu
+          DISTRI=`grep ^NAME /etc/os-release | sed -e 's/NAME="\(.*\)"/\1/'`
+          if [[ "${DISTRI}" = "Ubuntu" ]]; then
+            export CXX="clang-15"
+          fi
           export NUM_CPU_CORES="`nproc`"
         fi