Download the right go binary on darwin-arm64

This commit is contained in:
Ian Davis 2022-12-13 15:49:23 -08:00
parent f3830b60ae
commit 9720ce68f2
2 changed files with 14 additions and 2 deletions

View File

@ -34,6 +34,10 @@ commands:
default: false default: false
description: is a darwin build environment? description: is a darwin build environment?
type: boolean type: boolean
darwin-architecture:
default: "amd64"
description: which darwin architecture is being used?
type: string
steps: steps:
- checkout - checkout
- git_fetch_all_tags - git_fetch_all_tags
@ -59,7 +63,7 @@ commands:
- run: - run:
name: Install Go name: Install Go
command: | command: |
curl https://dl.google.com/go/go`cat GO_VERSION_MIN`.darwin-amd64.pkg -o /tmp/go.pkg && \ curl https://dl.google.com/go/go`cat GO_VERSION_MIN`.darwin-<<parameters.darwin-architecture>>.pkg -o /tmp/go.pkg && \
sudo installer -pkg /tmp/go.pkg -target / sudo installer -pkg /tmp/go.pkg -target /
- run: - run:
name: Export Go name: Export Go
@ -276,6 +280,7 @@ jobs:
- prepare: - prepare:
linux: false linux: false
darwin: true darwin: true
darwin-architecture: amd64
- run: make lotus lotus-miner lotus-worker - run: make lotus lotus-miner lotus-worker
- run: - run:
name: check tag and version output match name: check tag and version output match
@ -298,6 +303,7 @@ jobs:
- prepare: - prepare:
linux: false linux: false
darwin: true darwin: true
darwin-architecture: arm64
- run: | - run: |
export CPATH=$(brew --prefix)/include export CPATH=$(brew --prefix)/include
export LIBRARY_PATH=$(brew --prefix)/lib export LIBRARY_PATH=$(brew --prefix)/lib

View File

@ -34,6 +34,10 @@ commands:
default: false default: false
description: is a darwin build environment? description: is a darwin build environment?
type: boolean type: boolean
darwin-architecture:
default: "amd64"
description: which darwin architecture is being used?
type: string
steps: steps:
- checkout - checkout
- git_fetch_all_tags - git_fetch_all_tags
@ -59,7 +63,7 @@ commands:
- run: - run:
name: Install Go name: Install Go
command: | command: |
curl https://dl.google.com/go/go`cat GO_VERSION_MIN`.darwin-amd64.pkg -o /tmp/go.pkg && \ curl https://dl.google.com/go/go`cat GO_VERSION_MIN`.darwin-<<parameters.darwin-architecture>>.pkg -o /tmp/go.pkg && \
sudo installer -pkg /tmp/go.pkg -target / sudo installer -pkg /tmp/go.pkg -target /
- run: - run:
name: Export Go name: Export Go
@ -276,6 +280,7 @@ jobs:
- prepare: - prepare:
linux: false linux: false
darwin: true darwin: true
darwin-architecture: amd64
- run: make lotus lotus-miner lotus-worker - run: make lotus lotus-miner lotus-worker
- run: - run:
name: check tag and version output match name: check tag and version output match
@ -298,6 +303,7 @@ jobs:
- prepare: - prepare:
linux: false linux: false
darwin: true darwin: true
darwin-architecture: arm64
- run: | - run: |
export CPATH=$(brew --prefix)/include export CPATH=$(brew --prefix)/include
export LIBRARY_PATH=$(brew --prefix)/lib export LIBRARY_PATH=$(brew --prefix)/lib