From de9177f145a7b8b0784af0e6de22f6f1fa5ca0f8 Mon Sep 17 00:00:00 2001
From: Syrus Akbary <me@syrusakbary.com>
Date: Fri, 2 Feb 2024 19:33:48 +0100
Subject: [PATCH 1/4] Try to use m1 macos

---
 .github/workflows/build.yml | 18 +-----------------
 1 file changed, 1 insertion(+), 17 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index aab10e085c0..01f97570f91 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -60,7 +60,7 @@ jobs:
             use_llvm: true
             build_wasm: false
           - build: macos-arm64
-            os: macos-11.0
+            os: macos-latest-large
             target: aarch64-apple-darwin
             artifact_name: 'wasmer-darwin-arm64'
             use_sccache: false
@@ -191,17 +191,9 @@ jobs:
           echo 'RUSTC_WRAPPER=${{ runner.tool_cache }}/cargo-sccache/bin/sccache' >> $GITHUB_ENV
         shell: bash
       - name: Build C API headless
-        if: matrix.build != 'macos-arm64'
         shell: bash
         run: |
           make package-capi-headless
-      - name: Build C API headless
-        if: matrix.build == 'macos-arm64'
-        run: |
-          make package-capi-headless
-        env:
-          TARGET: aarch64-apple-darwin
-          TARGET_DIR: target/aarch64-apple-darwin/release
       - name: Build C API
         shell: bash
         run: |
@@ -248,16 +240,8 @@ jobs:
           make build-wasmer-headless-minimal
           rustup override unset
       - name: Dist
-        if: matrix.build != 'macos-arm64'
         run: |
           make distribution
-      - name: Dist macos-arm64
-        if: matrix.build == 'macos-arm64'
-        run: |
-          make distribution
-        env:
-          TARGET: aarch64-apple-darwin
-          TARGET_DIR: target/aarch64-apple-darwin/release
       - name: Upload Artifacts
         uses: actions/upload-artifact@v3
         with:

From 6066f9f97d9c601b12cd185057d3387a619a7160 Mon Sep 17 00:00:00 2001
From: Syrus Akbary <me@syrusakbary.com>
Date: Fri, 2 Feb 2024 19:36:26 +0100
Subject: [PATCH 2/4] Added m1 testing

---
 .github/workflows/test.yaml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index defcdcb4774..8e3e836c171 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -556,6 +556,12 @@ jobs:
             exe: '',
             llvm_url: 'https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/clang+llvm-15.0.7-x86_64-apple-darwin21.0.tar.xz'
           },
+          {
+            build: macos-arm64,
+            os: macos-latest-large,
+            target: aarch64-apple-darwin,
+            exe: '',
+          },
           {
             build: windows-x64,
             os: windows-2019,

From 614f11edea02e5839120fca20f79cc168ca46c21 Mon Sep 17 00:00:00 2001
From: Syrus Akbary <me@syrusakbary.com>
Date: Thu, 15 Feb 2024 10:17:03 -0800
Subject: [PATCH 3/4] Use m1 runner

---
 .github/workflows/build.yml | 2 +-
 .github/workflows/test.yaml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 01f97570f91..ce67866f737 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -60,7 +60,7 @@ jobs:
             use_llvm: true
             build_wasm: false
           - build: macos-arm64
-            os: macos-latest-large
+            os: macos-14
             target: aarch64-apple-darwin
             artifact_name: 'wasmer-darwin-arm64'
             use_sccache: false
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index 8e3e836c171..5e710426fbb 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -558,7 +558,7 @@ jobs:
           },
           {
             build: macos-arm64,
-            os: macos-latest-large,
+            os: macos-14,
             target: aarch64-apple-darwin,
             exe: '',
           },

From 1ba59244d877dbdf05a356991b12d5e02f965ea1 Mon Sep 17 00:00:00 2001
From: Syrus Akbary <me@syrusakbary.com>
Date: Thu, 15 Feb 2024 13:18:16 -0800
Subject: [PATCH 4/4] Disable artifact deserialization in non x86-64 for now

---
 tests/compilers/artifact.rs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/compilers/artifact.rs b/tests/compilers/artifact.rs
index ff04eb7551f..11443034da2 100644
--- a/tests/compilers/artifact.rs
+++ b/tests/compilers/artifact.rs
@@ -21,6 +21,7 @@ fn artifact_serialization_roundtrip() {
 }
 
 #[test]
+#[cfg(target_arch = "x86_64")]
 fn artifact_deserialization_roundtrip() {
     // This test is included to make sure we don't break the serialized format
     // by mistake. Otherwise, everything in this test is already tested in