From ee538bd7874107bafcfd71b761221688a6416acc Mon Sep 17 00:00:00 2001
From: Jean-Hadrien Chabran <jh@chabran.fr>
Date: Tue, 7 Dec 2021 18:18:05 +0100
Subject: [PATCH] Build binaries for darwin/arm64 (#3431)

Signed-off-by: Jean-Hadrien Chabran <jh@chabran.fr>
---
 .github/workflows/ci-build-binaries.yml | 2 ++
 Makefile                                | 6 +++++-
 scripts/package-deploy.sh               | 1 +
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/ci-build-binaries.yml b/.github/workflows/ci-build-binaries.yml
index 4c502d54cf2..d24458cb335 100644
--- a/.github/workflows/ci-build-binaries.yml
+++ b/.github/workflows/ci-build-binaries.yml
@@ -19,6 +19,8 @@ jobs:
           task: build-binaries-windows
         - name: osx
           task: build-binaries-darwin
+        - name: osx-m1
+          task: build-binaries-darwin-arm64
         - name: system/390
           task: build-binaries-s390x
         - name: arm
diff --git a/Makefile b/Makefile
index faf7bcc3cd2..8b8c8f03553 100644
--- a/Makefile
+++ b/Makefile
@@ -247,6 +247,10 @@ build-binaries-windows:
 build-binaries-darwin:
 	GOOS=darwin GOARCH=amd64 $(MAKE) build-platform-binaries
 
+.PHONY: build-binaries-darwin-arm64
+build-binaries-darwin-arm64:
+	GOOS=darwin GOARCH=arm64 $(MAKE) build-platform-binaries
+
 .PHONY: build-binaries-s390x
 build-binaries-s390x:
 	GOOS=linux GOARCH=s390x $(MAKE) build-platform-binaries
@@ -277,7 +281,7 @@ build-platform-binaries: build-agent \
 	build-es-rollover
 
 .PHONY: build-all-platforms
-build-all-platforms: build-binaries-linux build-binaries-windows build-binaries-darwin build-binaries-s390x build-binaries-arm64 build-binaries-ppc64le
+build-all-platforms: build-binaries-linux build-binaries-windows build-binaries-darwin build-binaries-darwin-arm64 build-binaries-s390x build-binaries-arm64 build-binaries-ppc64le
 
 .PHONY: docker-images-cassandra
 docker-images-cassandra:
diff --git a/scripts/package-deploy.sh b/scripts/package-deploy.sh
index dce344abc79..122122067df 100755
--- a/scripts/package-deploy.sh
+++ b/scripts/package-deploy.sh
@@ -59,6 +59,7 @@ mkdir $DEPLOY_STAGING_DIR
 
 package linux-amd64
 package darwin-amd64
+package darwin-arm64
 package windows-amd64 .exe
 package linux-s390x
 package linux-arm64