chore(ci): add arm64 for macOS (#1212)

This PR adds the macOS 14 GitHub runner that uses the arm64 cpu.
This commit is contained in:
diegomrsantos 2024-12-21 02:18:56 +01:00 committed by GitHub
parent 39d0451a10
commit 1fa30f07e8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 14 additions and 6 deletions

View File

@ -88,6 +88,8 @@ runs:
run: | run: |
if [[ '${{ inputs.cpu }}' == 'amd64' ]]; then if [[ '${{ inputs.cpu }}' == 'amd64' ]]; then
PLATFORM=x64 PLATFORM=x64
elif [[ '${{ inputs.cpu }}' == 'arm64' ]]; then
PLATFORM=arm64
else else
PLATFORM=x86 PLATFORM=x86
fi fi

View File

@ -27,6 +27,8 @@ jobs:
cpu: amd64 cpu: amd64
- os: macos - os: macos
cpu: amd64 cpu: amd64
- os: macos-14
cpu: arm64
- os: windows - os: windows
cpu: amd64 cpu: amd64
nim: nim:
@ -47,6 +49,10 @@ jobs:
os: macos os: macos
builder: macos-13 builder: macos-13
shell: bash shell: bash
- platform:
os: macos-14
builder: macos-14
shell: bash
- platform: - platform:
os: windows os: windows
builder: windows-2022 builder: windows-2022
@ -75,7 +81,7 @@ jobs:
- name: Setup Go - name: Setup Go
uses: actions/setup-go@v5 uses: actions/setup-go@v5
with: with:
go-version: '~1.15.5' go-version: '~1.16.0' # That's the minimum Go version that works with arm.
- name: Install p2pd - name: Install p2pd
run: | run: |
@ -87,8 +93,8 @@ jobs:
with: with:
path: nimbledeps path: nimbledeps
# Using nim.ref as a simple way to differentiate between nimble using the "pkgs" or "pkgs2" directories. # 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. # 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 }}-${{ hashFiles('.pinned') }} # hashFiles returns a different value on windows key: nimbledeps-${{ matrix.nim.ref }}-${{ matrix.builder }}-${{ matrix.platform.cpu }}-${{ hashFiles('.pinned') }} # hashFiles returns a different value on windows
- name: Install deps - name: Install deps
if: ${{ steps.deps-cache.outputs.cache-hit != 'true' }} if: ${{ steps.deps-cache.outputs.cache-hit != 'true' }}

View File

@ -75,7 +75,7 @@ jobs:
- name: Setup Go - name: Setup Go
uses: actions/setup-go@v5 uses: actions/setup-go@v5
with: with:
go-version: '~1.15.5' go-version: '~1.16.0'
cache: false cache: false
- name: Install p2pd - name: Install p2pd

View File

@ -13,7 +13,7 @@ For more information about the go daemon, check out [this repository](https://gi
> **Required only** for running the tests. > **Required only** for running the tests.
# Prerequisites # 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**. > You will *likely* be able to build `go-libp2p-daemon` with different Go versions, but **they haven't been tested**.
# Installation # Installation
@ -21,7 +21,7 @@ Follow one of the methods below:
## Script ## Script
Run the build script while having the `go` command pointing to the correct Go version. 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 ```sh
./scripts/build_p2pd.sh ./scripts/build_p2pd.sh
``` ```