From 1fa30f07e81e9ef415a83c5d3846e86e99a7857f Mon Sep 17 00:00:00 2001
From: diegomrsantos <diego@status.im>
Date: Sat, 21 Dec 2024 02:18:56 +0100
Subject: [PATCH] chore(ci): add arm64 for macOS (#1212)

This PR adds the macOS 14 GitHub runner that uses the arm64 cpu.
---
 .github/actions/install_nim/action.yml |  2 ++
 .github/workflows/ci.yml               | 12 +++++++++---
 .github/workflows/daily_common.yml     |  2 +-
 examples/go-daemon/daemonapi.md        |  4 ++--
 4 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/.github/actions/install_nim/action.yml b/.github/actions/install_nim/action.yml
index 96bdcec2a..55a0fc892 100644
--- a/.github/actions/install_nim/action.yml
+++ b/.github/actions/install_nim/action.yml
@@ -88,6 +88,8 @@ runs:
       run: |
         if [[ '${{ inputs.cpu }}' == 'amd64' ]]; then
           PLATFORM=x64
+        elif [[ '${{ inputs.cpu }}' == 'arm64' ]]; then
+          PLATFORM=arm64
         else
           PLATFORM=x86
         fi
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index decaaabbe..e1a6c4fe4 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -27,6 +27,8 @@ jobs:
             cpu: amd64
           - os: macos
             cpu: amd64
+          - os: macos-14
+            cpu: arm64
           - os: windows
             cpu: amd64
         nim:
@@ -47,6 +49,10 @@ jobs:
               os: macos
             builder: macos-13
             shell: bash
+          - platform:
+              os: macos-14
+            builder: macos-14
+            shell: bash
           - platform:
               os: windows
             builder: windows-2022
@@ -75,7 +81,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v5
         with:
-          go-version: '~1.15.5'
+          go-version: '~1.16.0' # That's the minimum Go version that works with arm.
 
       - name: Install p2pd
         run: |
@@ -87,8 +93,8 @@ jobs:
         with:
           path: nimbledeps
           # Using nim.ref as a simple way to differentiate between nimble using the "pkgs" or "pkgs2" directories.
-          # The change happened on Nimble v0.14.0.
-          key: nimbledeps-${{ matrix.nim.ref }}-${{ hashFiles('.pinned') }} # hashFiles returns a different value on windows
+          # The change happened on Nimble v0.14.0. Also forcing the deps to be reinstalled on each os and cpu.
+          key: nimbledeps-${{ matrix.nim.ref }}-${{ matrix.builder }}-${{ matrix.platform.cpu }}-${{ hashFiles('.pinned') }} # hashFiles returns a different value on windows
 
       - name: Install deps
         if: ${{ steps.deps-cache.outputs.cache-hit != 'true' }}
diff --git a/.github/workflows/daily_common.yml b/.github/workflows/daily_common.yml
index 687dd4af1..46a071302 100644
--- a/.github/workflows/daily_common.yml
+++ b/.github/workflows/daily_common.yml
@@ -75,7 +75,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v5
         with:
-          go-version: '~1.15.5'
+          go-version: '~1.16.0'
           cache: false
 
       - name: Install p2pd
diff --git a/examples/go-daemon/daemonapi.md b/examples/go-daemon/daemonapi.md
index cdeb03704..786cf2023 100644
--- a/examples/go-daemon/daemonapi.md
+++ b/examples/go-daemon/daemonapi.md
@@ -13,7 +13,7 @@ For more information about the go daemon, check out [this repository](https://gi
 > **Required only** for running the tests.
 
 # Prerequisites
-Go with version `1.15.15`.
+Go with version `1.16.0`.
 > You will *likely* be able to build `go-libp2p-daemon` with different Go versions, but **they haven't been tested**.
 
 # Installation
@@ -21,7 +21,7 @@ Follow one of the methods below:
 
 ## Script
 Run the build script while having the `go` command pointing to the correct Go version.
-We recommend using `1.15.15`, as previously stated.
+We recommend using `1.16.0`, as previously stated.
 ```sh
 ./scripts/build_p2pd.sh
 ```