From b525cd381d247c5e1a237472f60cf70ab9b2f3c9 Mon Sep 17 00:00:00 2001 From: Diego Date: Thu, 10 Oct 2024 14:36:59 +0200 Subject: [PATCH 1/3] add arm64 for macOS --- .github/actions/install_nim/action.yml | 2 ++ .github/workflows/ci.yml | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/.github/actions/install_nim/action.yml b/.github/actions/install_nim/action.yml index 83de4f313..403f5aa27 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 3187c5502..ed87be534 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -27,6 +27,8 @@ jobs: cpu: amd64 - os: macos cpu: amd64 + - os: macos-arm64 + cpu: arm64 - os: windows cpu: amd64 nim: @@ -47,6 +49,10 @@ jobs: os: macos builder: macos-13 shell: bash + - platform: + os: macos-arm64 + builder: macos-14 + shell: bash - platform: os: windows builder: windows-2022 From 82086cc2057f95827ac5d518de6dfb2f25ca42b9 Mon Sep 17 00:00:00 2001 From: Diego Date: Thu, 10 Oct 2024 14:52:04 +0200 Subject: [PATCH 2/3] try to update go version --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ed87be534..86ebd36eb 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -81,7 +81,7 @@ jobs: - name: Setup Go uses: actions/setup-go@v5 with: - go-version: '~1.15.5' + go-version: '~1.16.0' - name: Install p2pd run: | From db8deaaa9942d1a1bbf302c28e9cf22fea9c8a2b Mon Sep 17 00:00:00 2001 From: Diego Date: Thu, 10 Oct 2024 15:21:29 +0200 Subject: [PATCH 3/3] rename os --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 86ebd36eb..499190695 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -27,7 +27,7 @@ jobs: cpu: amd64 - os: macos cpu: amd64 - - os: macos-arm64 + - os: macos-14 cpu: arm64 - os: windows cpu: amd64 @@ -50,7 +50,7 @@ jobs: builder: macos-13 shell: bash - platform: - os: macos-arm64 + os: macos-14 builder: macos-14 shell: bash - platform: