From ccc77617846887b801fcc6fb9df49e0d6684eb63 Mon Sep 17 00:00:00 2001
From: Andrew Kaster <andrew@ladybird.org>
Date: Thu, 6 Mar 2025 10:25:23 -0700
Subject: [PATCH 1/4] ci: Add ubuntu-24.04-arm regular CI and release artifact

---
 .github/workflows/build.yml         | 4 ++--
 .github/workflows/build_release.yml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index cbbf183040..cf50061fd4 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -30,7 +30,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-latest, macos-13, macos-latest, windows-latest]
+        os: [ubuntu-latest, ubuntu-24.04-arm, macos-13, macos-latest, windows-latest]
     steps:
     - uses: actions/setup-python@v5
       with:
@@ -40,7 +40,7 @@ jobs:
         submodules: true
     - name: install ninja (linux)
       run: sudo apt-get install ninja-build
-      if: matrix.os == 'ubuntu-latest'
+      if: startsWith(matrix.os, 'ubuntu-')
     - name: install ninja (osx)
       run: brew install ninja
       if: matrix.os == 'macos-13' || matrix.os == 'macos-latest'
diff --git a/.github/workflows/build_release.yml b/.github/workflows/build_release.yml
index db9c64c396..f0c46bd06c 100644
--- a/.github/workflows/build_release.yml
+++ b/.github/workflows/build_release.yml
@@ -15,7 +15,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-20.04, macos-14, windows-latest]
+        os: [ubuntu-20.04, ubuntu-24.04-arm, macos-14, windows-latest]
     defaults:
       run:
         shell: bash

From d8259dfa37e2bc580fa11fedf6eb6fbb9db42f51 Mon Sep 17 00:00:00 2001
From: Andrew Kaster <andrew@ladybird.org>
Date: Thu, 6 Mar 2025 12:31:50 -0700
Subject: [PATCH 2/4] ci: Use associative array for release archive osname

---
 .github/actions/release-archive/action.yml | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/.github/actions/release-archive/action.yml b/.github/actions/release-archive/action.yml
index 0b4f7fb091..980dfb7889 100644
--- a/.github/actions/release-archive/action.yml
+++ b/.github/actions/release-archive/action.yml
@@ -13,9 +13,14 @@ runs:
       id: archive
       shell: bash
       run: |
-        OSNAME=$(echo ${{ inputs.os }} | sed 's/-latest//')
+        declare -A OSNAME=(
+          [ubuntu-20.04]="linux-x64",
+          [ubuntu-24.04-arm]="linux-arm64",
+          [macos-14]="macos-14",
+          [windows-latest]="windows-x64"
+        )
         VERSION=${{ github.event.release.tag_name || github.sha }}
-        PKGNAME="wabt-$VERSION-$OSNAME"
+        PKGNAME="wabt-$VERSION-${OSNAME[${{ input.os }}]}"
         TARBALL=$PKGNAME.tar.gz
         SHASUM=$PKGNAME.tar.gz.sha256
         mv install wabt-$VERSION

From 907a247227e72c8dfee26ea543813ef3a55d4e7c Mon Sep 17 00:00:00 2001
From: Andrew Kaster <andrew@ladybird.org>
Date: Thu, 6 Mar 2025 12:34:05 -0700
Subject: [PATCH 3/4] ci: typo :(

---
 .github/actions/release-archive/action.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/actions/release-archive/action.yml b/.github/actions/release-archive/action.yml
index 980dfb7889..3175580ab7 100644
--- a/.github/actions/release-archive/action.yml
+++ b/.github/actions/release-archive/action.yml
@@ -20,7 +20,7 @@ runs:
           [windows-latest]="windows-x64"
         )
         VERSION=${{ github.event.release.tag_name || github.sha }}
-        PKGNAME="wabt-$VERSION-${OSNAME[${{ input.os }}]}"
+        PKGNAME="wabt-$VERSION-${OSNAME[${{ inputs.os }}]}"
         TARBALL=$PKGNAME.tar.gz
         SHASUM=$PKGNAME.tar.gz.sha256
         mv install wabt-$VERSION

From 42ac3e19c6f8eaad456393279bc174f55c733923 Mon Sep 17 00:00:00 2001
From: Andrew Kaster <andrew@ladybird.org>
Date: Thu, 6 Mar 2025 12:36:46 -0700
Subject: [PATCH 4/4] ci: don't forget wasi

---
 .github/actions/release-archive/action.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/actions/release-archive/action.yml b/.github/actions/release-archive/action.yml
index 3175580ab7..9e239b7d24 100644
--- a/.github/actions/release-archive/action.yml
+++ b/.github/actions/release-archive/action.yml
@@ -17,7 +17,8 @@ runs:
           [ubuntu-20.04]="linux-x64",
           [ubuntu-24.04-arm]="linux-arm64",
           [macos-14]="macos-14",
-          [windows-latest]="windows-x64"
+          [windows-latest]="windows-x64",
+          [wasi]="wasi",
         )
         VERSION=${{ github.event.release.tag_name || github.sha }}
         PKGNAME="wabt-$VERSION-${OSNAME[${{ inputs.os }}]}"