From 0638a06db50b0b5cdacb791bc9e9a3a09a417e0f Mon Sep 17 00:00:00 2001
From: Yagiz Nizipli <yagiz@cloudflare.com>
Date: Thu, 23 Jan 2025 14:12:26 -0500
Subject: [PATCH] simplify github workflows

---
 .github/workflows/aarch64.yml             | 43 -----------------------
 .github/workflows/macos_install.yml       |  2 +-
 .github/workflows/ubuntu.yml              |  3 +-
 .github/workflows/ubuntu_install.yml      |  7 ++--
 .github/workflows/visual_studio.yml       |  2 +-
 .github/workflows/visual_studio_clang.yml |  2 +-
 6 files changed, 9 insertions(+), 50 deletions(-)
 delete mode 100644 .github/workflows/aarch64.yml

diff --git a/.github/workflows/aarch64.yml b/.github/workflows/aarch64.yml
deleted file mode 100644
index 85a67ceb5..000000000
--- a/.github/workflows/aarch64.yml
+++ /dev/null
@@ -1,43 +0,0 @@
-name: Ubuntu aarch64 (GCC 12)
-
-on:
-  pull_request:
-    types: [opened, synchronize, reopened, ready_for_review]
-    paths-ignore:
-      - '**.md'
-      - 'docs/**'
-  push:
-    branches:
-      - main
-    paths-ignore:
-      - '**.md'
-      - 'docs/**'
-
-permissions:
-  contents: read
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-      - uses: uraimo/run-on-arch-action@5397f9e30a9b62422f302092631c99ae1effcd9e # v2.8.1
-        name: Build and Test
-        id: runcmd
-        with:
-          arch: aarch64
-          githubToken: ${{ github.token }}
-          distro: ubuntu22.04
-          install: |
-            apt-get update -q -y
-            apt-get install -y cmake make g++-12 ninja-build git gcc-12
-            ln -s -f /usr/bin/gcc-12 /usr/bin/gcc
-            ln -s -f /usr/bin/g++-12 /usr/bin/g++
-          run: |
-            cmake -DCMAKE_CXX_STANDARD=20 -D ADA_TESTING=ON -B build
-            cmake --build build
-            ctest --test-dir build
diff --git a/.github/workflows/macos_install.yml b/.github/workflows/macos_install.yml
index fe1b0e1b0..fa948c1cb 100644
--- a/.github/workflows/macos_install.yml
+++ b/.github/workflows/macos_install.yml
@@ -22,7 +22,7 @@ concurrency:
 
 jobs:
   macos-build:
-    runs-on: macos-latest
+    runs-on: macos-15
     strategy:
       matrix:
         include:
diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml
index c20fdc5e1..451ae433a 100644
--- a/.github/workflows/ubuntu.yml
+++ b/.github/workflows/ubuntu.yml
@@ -22,11 +22,12 @@ concurrency:
 
 jobs:
   ubuntu-build:
-    runs-on: ubuntu-22.04
     strategy:
       matrix:
         shared: [ON, OFF]
         cxx: [g++-12, clang++-14]
+        runs-on: [ubuntu-22.04, ubuntu-22.04-arm]
+    runs-on: ${{matrix.runs-on}}
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       - name: Setup Ninja
diff --git a/.github/workflows/ubuntu_install.yml b/.github/workflows/ubuntu_install.yml
index a92199ba0..e5b2b5563 100644
--- a/.github/workflows/ubuntu_install.yml
+++ b/.github/workflows/ubuntu_install.yml
@@ -25,15 +25,16 @@ jobs:
     runs-on: ubuntu-24.04
     strategy:
       matrix:
-        include:
-          shared: [ON, OFF]
-          cxx: [g++-12, clang++]
+        shared: [ON, OFF]
+        cxx: [g++-12, clang++]
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       - name: Setup Ninja
         run: sudo apt-get install ninja-build
       - name: Prepare
         run: cmake -D ADA_TESTING=ON -G Ninja -DBUILD_SHARED_LIBS=${{matrix.shared}} -DCMAKE_INSTALL_PREFIX:PATH=destination -B build
+        env:
+          CXX: ${{matrix.cxx}}
       - name: Build
         run: cmake --build build -j=4
       - name: Install
diff --git a/.github/workflows/visual_studio.yml b/.github/workflows/visual_studio.yml
index 7ce4ce3c2..7c7e4b3ae 100644
--- a/.github/workflows/visual_studio.yml
+++ b/.github/workflows/visual_studio.yml
@@ -23,7 +23,7 @@ concurrency:
 jobs:
   ci:
     name: windows-vs17
-    runs-on: windows-latest
+    runs-on: windows-2025
     strategy:
       fail-fast: false
       matrix:
diff --git a/.github/workflows/visual_studio_clang.yml b/.github/workflows/visual_studio_clang.yml
index 5c2b71aac..79064e947 100644
--- a/.github/workflows/visual_studio_clang.yml
+++ b/.github/workflows/visual_studio_clang.yml
@@ -23,7 +23,7 @@ concurrency:
 jobs:
   ci:
     name: windows-vs17
-    runs-on: windows-latest
+    runs-on: windows-2025
     strategy:
       fail-fast: false
       matrix: