Skip to content

Commit

Permalink
server/etcdmain: add build support for Apple M1
Browse files Browse the repository at this point in the history
This has been additionally verified by running the tests locally as a
basic smoke test. GitHub Actions doesn't provide MacOS M1 (arm64) yet,
so there's no good way to automate testing.

Ran `TMPDIR=/tmp make test` locally. The `TMPDIR` bit is needed so
there's no really long path used that breaks Unix socket setup in one of
the tests.

Signed-off-by: Marek Siarkowicz <siarkowicz@google.com>
  • Loading branch information
dbussink authored and serathius committed Sep 7, 2022
1 parent ba52d5a commit c79f96d
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 0 deletions.
1 change: 1 addition & 0 deletions .github/workflows/tests.yaml
Expand Up @@ -44,6 +44,7 @@ jobs:
GOARCH=amd64 PASSES='build' ./test.sh
GOARCH=386 PASSES='build' ./test.sh
GO_BUILD_FLAGS='-v -mod=readonly' GOOS=darwin GOARCH=amd64 ./build.sh
GO_BUILD_FLAGS='-v -mod=readonly' GOOS=darwin GOARCH=arm64 ./build.sh
GO_BUILD_FLAGS='-v -mod=readonly' GOOS=windows GOARCH=amd64 ./build.sh
GO_BUILD_FLAGS='-v -mod=readonly' GOARCH=arm ./build.sh
GO_BUILD_FLAGS='-v -mod=readonly' GOARCH=arm64 ./build.sh
Expand Down
4 changes: 4 additions & 0 deletions scripts/build-binary
Expand Up @@ -79,6 +79,10 @@ function main {
TARGET_ARCHS+=("s390x")
fi

if [ ${GOOS} == "darwin" ]; then
TARGET_ARCHS+=("arm64")
fi

for TARGET_ARCH in "${TARGET_ARCHS[@]}"; do
export GOARCH=${TARGET_ARCH}

Expand Down

0 comments on commit c79f96d

Please sign in to comment.