From 49ca4bdb7da38ea51b47901815fa4f66ca5bfd61 Mon Sep 17 00:00:00 2001
From: Matthew Fluet <matthew.fluet@gmail.com>
Date: Fri, 17 Jan 2025 11:27:43 -0500
Subject: [PATCH] Experiment with ubuntu-24.04-arm runner in CI workflow

---
 .../install-bootstrap-dependencies/action.yml     | 15 ++++++++++++++-
 .github/workflows/ci.yml                          | 10 ++++++++++
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/.github/actions/install-bootstrap-dependencies/action.yml b/.github/actions/install-bootstrap-dependencies/action.yml
index c08856a54..0850f82de 100644
--- a/.github/actions/install-bootstrap-dependencies/action.yml
+++ b/.github/actions/install-bootstrap-dependencies/action.yml
@@ -12,7 +12,7 @@ runs:
       if: ${{ contains(fromJSON('["ubuntu-20.04", "ubuntu-22.04", "ubuntu-24.04"]'), inputs.runner) }}
       shell: 'bash'
       run: |
-        # Install dependencies (ubuntu)
+        # Install dependencies (ubuntu (amd64))
         sudo apt-get update
         sudo apt-get install libgmp-dev
         if [[ "${{ inputs.install-llvm }}" == "true" ]]; then sudo apt-get install llvm; fi
@@ -21,6 +21,19 @@ runs:
         tar xzf mlton-20241230-1.amd64-linux.ubuntu-20.04_glibc2.31.tgz --exclude='*/share' --strip-components=1
         rm mlton-20241230-1.amd64-linux.ubuntu-20.04_glibc2.31.tgz
 
+    - name: Install bootstrap dependencies (ubuntu (arm64))
+      if: ${{ contains(fromJSON('["ubuntu-22.04-arm", "ubuntu-24.04-arm"]'), inputs.runner) }}
+      shell: 'bash'
+      run: |
+        # Install dependencies (ubuntu (arm))
+        sudo apt-get update
+        sudo apt-get install libgmp-dev
+        if [[ "${{ inputs.install-llvm }}" == "true" ]]; then sudo apt-get install llvm; fi
+        mkdir boot && cd boot
+        curl -sOL https://github.com/ii8/mlton-builds/releases/download/20241230/mlton-20241230.aarch64-linux-gnu.tar.gz
+        tar xzf mlton-20241230.aarch64-linux-gnu.tar.gz --exclude='*/share' --strip-components=1
+        rm mlton-20241230.aarch64-linux-gnu.tar.gz
+
     - name: Install bootstrap dependencies (macos (amd64))
       if: ${{ contains(fromJSON('["macos-13"]'), inputs.runner) }}
       shell: 'bash'
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 94bb533be..6670f6351 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -28,6 +28,16 @@ jobs:
             cc: "clang"
             codegen: "llvm"
 
+          - runner: "ubuntu-24.04-arm"
+            cc: "gcc"
+            codegen: "c"
+          - runner: "ubuntu-24.04-arm"
+            cc: "clang"
+            codegen: "c"
+          - runner: "ubuntu-24.04-arm"
+            cc: "clang"
+            codegen: "llvm"
+
           - runner: "macos-13"
             cc: "clang"
             codegen: "amd64"