From 497eb0c0395fcef067c044757d63ab63d96d9285 Mon Sep 17 00:00:00 2001
From: "Sean T. Allen" <sean@seantallen.com>
Date: Fri, 27 May 2022 08:50:37 -0400
Subject: [PATCH 1/2] Add prebuilt corral binaries for MacOS on Apple Silicon

---
 .../release/arm64-apple-darwin-release.bash   | 101 ++++++++++++++++++
 .cirrus.yml                                   |  20 ++++
 .release-notes/arm64-macos.md                 |   3 +
 3 files changed, 124 insertions(+)
 create mode 100644 .ci-scripts/release/arm64-apple-darwin-release.bash
 create mode 100644 .release-notes/arm64-macos.md

diff --git a/.ci-scripts/release/arm64-apple-darwin-release.bash b/.ci-scripts/release/arm64-apple-darwin-release.bash
new file mode 100644
index 00000000..5fdd86f8
--- /dev/null
+++ b/.ci-scripts/release/arm64-apple-darwin-release.bash
@@ -0,0 +1,101 @@
+#!/bin/bash
+
+# x86-64-unknown-linux release:
+#
+# - Builds release package
+# - Uploads to Cloudsmith
+#
+# Tools required in the environment that runs this:
+#
+# - bash
+# - cloudsmith-cli
+# - GNU gzip
+# - GNU make
+# - ponyc
+# - GNU tar
+
+set -o errexit
+
+# Pull in shared configuration specific to this repo
+base=$(dirname "$0")
+# shellcheck source=.ci-scripts/release/config.bash
+source "${base}/config.bash"
+
+# Verify ENV is set up correctly
+# We validate all that need to be set in case, in an absolute emergency,
+# we need to run this by hand. Otherwise the GitHub actions environment should
+# provide all of these if properly configured
+if [[ -z "${CLOUDSMITH_API_KEY}" ]]; then
+  echo -e "\e[31mCloudsmith API key needs to be set in CLOUDSMITH_API_KEY."
+  echo -e "Exiting.\e[0m"
+  exit 1
+fi
+
+if [[ -z "${GITHUB_REPOSITORY}" ]]; then
+  echo -e "\e[31mName of this repository needs to be set in GITHUB_REPOSITORY."
+  echo -e "\e[31mShould be in the form OWNER/REPO, for example:"
+  echo -e "\e[31m     ponylang/ponyup"
+  echo -e "\e[31mExiting.\e[0m"
+  exit 1
+fi
+
+if [[ -z "${APPLICATION_NAME}" ]]; then
+  echo -e "\e[31mAPPLICATION_NAME needs to be set."
+  echo -e "\e[31mExiting.\e[0m"
+  exit 1
+fi
+
+if [[ -z "${APPLICATION_SUMMARY}" ]]; then
+  echo -e "\e[31mAPPLICATION_SUMMARY needs to be set."
+  echo -e "\e[31mIt's a short description of the application that will appear in Cloudsmith."
+  echo -e "\e[31mExiting.\e[0m"
+  exit 1
+fi
+
+# no unset variables allowed from here on out
+# allow above so we can display nice error messages for expected unset variables
+set -o nounset
+
+# Compiler target parameters
+ARCH=arm64
+CPU=apple-m1
+
+# Triple construction
+VENDOR=apple
+OS=darwin
+TRIPLE=${ARCH}-${VENDOR}-${OS}
+
+# Build parameters
+BUILD_PREFIX=$(mktemp -d)
+APPLICATION_VERSION=$(cat VERSION)
+BUILD_DIR=${BUILD_PREFIX}/${APPLICATION_VERSION}
+
+# Asset information
+PACKAGE_DIR=$(mktemp -d)
+PACKAGE=${APPLICATION_NAME}-${TRIPLE}
+
+# Cloudsmith configuration
+CLOUDSMITH_VERSION=$(cat VERSION)
+ASSET_OWNER=ponylang
+ASSET_REPO=nightlies
+ASSET_PATH=${ASSET_OWNER}/${ASSET_REPO}
+ASSET_FILE=${PACKAGE_DIR}/${PACKAGE}.tar.gz
+ASSET_SUMMARY="${APPLICATION_SUMMARY}"
+ASSET_DESCRIPTION="https://github.com/${GITHUB_REPOSITORY}"
+
+# Build application installation
+echo -e "\e[34mBuilding ${APPLICATION_NAME}...\e[0m"
+make install prefix="${BUILD_DIR}" arch=${CPU} \
+  version="${APPLICATION_VERSION}"
+
+# Package it all up
+echo -e "\e[34mCreating .tar.gz of ${APPLICATION_NAME}...\e[0m"
+pushd "${BUILD_PREFIX}" || exit 1
+tar -cvzf "${ASSET_FILE}" -- *
+popd || exit 1
+
+# Ship it off to cloudsmith
+echo -e "\e[34mUploading package to cloudsmith...\e[0m"
+cloudsmith push raw --version "${CLOUDSMITH_VERSION}" \
+  --api-key "${CLOUDSMITH_API_KEY}" --summary "${ASSET_SUMMARY}" \
+  --description "${ASSET_DESCRIPTION}" ${ASSET_PATH} "${ASSET_FILE}"
diff --git a/.cirrus.yml b/.cirrus.yml
index b8d47c92..d31aac2a 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -113,3 +113,23 @@ task:
     - export PATH="$HOME/.local/share/ponyup/bin/:$PATH"
     - bash .ci-scripts/release/x86-64-unknown-freebsd-13.0-release.bash
 
+task:
+  only_if: $CIRRUS_TAG =~ '^\d+\.\d+\.\d+$'
+
+  macos_instance:
+    image: ghcr.io/cirruslabs/macos-monterey-xcode:13.3.1
+
+  name: "release: arm64-apple-darwin"
+
+  environment:
+    CLOUDSMITH_API_KEY: ENCRYPTED[fd6a633b6b830c0558d7553d2b1e899b48a47f82037c764ac15febb69a49a53e7415573562f89675ecca9d4e8d6c4969]
+    GITHUB_REPOSITORY: ponylang/corral
+
+  install_script:
+    - brew install coreutils
+    - pip3 install --upgrade cloudsmith-cli
+    - bash .ci-scripts/MacOS-arm64-install-pony-tools.bash release
+
+  nightly_script:
+    - export PATH="/tmp/ponyc/bin/:/Users/admin/Library/Python/3.8/bin:$PATH"
+    - bash .ci-scripts/release/arm64-apple-darwin-release.bash
diff --git a/.release-notes/arm64-macos.md b/.release-notes/arm64-macos.md
new file mode 100644
index 00000000..137eb38f
--- /dev/null
+++ b/.release-notes/arm64-macos.md
@@ -0,0 +1,3 @@
+## Add prebuilt corral binaries for MacOS on Apple Silicon
+
+We've added corral binaries for MacOS on Apple Silicon that can be installed via `ponyup`.

From 9afea333e589d75dae2a3c47e272fe23d4ce74bb Mon Sep 17 00:00:00 2001
From: Sean T Allen <sean@seantallen.com>
Date: Fri, 27 May 2022 09:01:34 -0400
Subject: [PATCH 2/2] Update
 .ci-scripts/release/arm64-apple-darwin-release.bash

Co-authored-by: Borja o'Cook <ergl@users.noreply.github.com>
---
 .ci-scripts/release/arm64-apple-darwin-release.bash | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.ci-scripts/release/arm64-apple-darwin-release.bash b/.ci-scripts/release/arm64-apple-darwin-release.bash
index 5fdd86f8..9f512828 100644
--- a/.ci-scripts/release/arm64-apple-darwin-release.bash
+++ b/.ci-scripts/release/arm64-apple-darwin-release.bash
@@ -77,7 +77,7 @@ PACKAGE=${APPLICATION_NAME}-${TRIPLE}
 # Cloudsmith configuration
 CLOUDSMITH_VERSION=$(cat VERSION)
 ASSET_OWNER=ponylang
-ASSET_REPO=nightlies
+ASSET_REPO=releases
 ASSET_PATH=${ASSET_OWNER}/${ASSET_REPO}
 ASSET_FILE=${PACKAGE_DIR}/${PACKAGE}.tar.gz
 ASSET_SUMMARY="${APPLICATION_SUMMARY}"