Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add MacOS on Apple Silicon as a fully supported platform #261

Merged
merged 1 commit into from
Jan 31, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 29 additions & 0 deletions .github/workflows/nightlies.yml
Original file line number Diff line number Diff line change
Expand Up @@ -85,3 +85,32 @@ jobs:
type: stream
topic: ${{ github.repository }} scheduled job failure
content: ${{ github.server_url}}/${{ github.repository }}/actions/runs/${{ github.run_id }} failed.

arm64-apple-darwin-nightly:
name: Build and upload arm64-apple-darwin-nightly to Cloudsmith
runs-on: macos-14
steps:
- uses: actions/checkout@v3
- name: install ponyc
run: bash .ci-scripts/macOS-arm64-install-pony-tools.bash nightly
- name: brew install dependencies
run: brew install coreutils
- name: pip install dependencies
run: pip3 install --upgrade cloudsmith-cli
- name: Build and upload
run: |
export PATH="/tmp/ponyc/bin/:/Library/Frameworks/Python.framework/Versions/3.11/bin/:$PATH"
bash .ci-scripts/release/arm64-apple-darwin-nightly.bash
env:
CLOUDSMITH_API_KEY: ${{ secrets.CLOUDSMITH_API_KEY }}
- name: Send alert on failure
if: ${{ failure() }}
uses: zulip/github-actions-zulip/send-message@b62d5a0e48a4d984ea4fce5dd65ba691963d4db4
with:
api-key: ${{ secrets.ZULIP_SCHEDULED_JOB_FAILURE_API_KEY }}
email: ${{ secrets.ZULIP_SCHEDULED_JOB_FAILURE_EMAIL }}
organization-url: 'https://ponylang.zulipchat.com/'
to: notifications
type: stream
topic: ${{ github.repository }} scheduled job failure
content: ${{ github.server_url}}/${{ github.repository }}/actions/runs/${{ github.run_id }} failed.
26 changes: 20 additions & 6 deletions .github/workflows/pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@ jobs:
- name: Verify CHANGELOG
run: changelog-tool verify

linux:
name: Verify PR builds most recent ponyc release on Linux
x86_linux:
name: x86_64 Linux
runs-on: ubuntu-latest
container:
image: ghcr.io/ponylang/shared-docker-ci-x86-64-unknown-linux-builder:release
Expand All @@ -50,8 +50,8 @@ jobs:
- name: Test with most recent ponyc release
run: make test

windows:
name: Verify PR builds most recent ponyc release on Windows
x86_windows:
name: x86_64 Windows
runs-on: windows-2022
steps:
- uses: actions/checkout@v3
Expand All @@ -62,8 +62,8 @@ jobs:
$env:PATH = 'C:\ponyc\bin;' + $env:PATH;
.\make.ps1 -Command test 2>&1

macos:
name: Verify PR builds most recent ponyc release on macOS
x86_macos:
name: x86_64 MacOS
runs-on: macos-13
steps:
- uses: actions/checkout@v3
Expand All @@ -75,3 +75,17 @@ jobs:
run: |
export PATH="/tmp/ponyc/bin/:$PATH"
make test

arm64_macos:
name: arm64 MacOS
runs-on: macos-14
steps:
- uses: actions/checkout@v3
- name: install ponyc
run: bash .ci-scripts/macOS-arm64-install-pony-tools.bash nightly
- name: brew install dependencies
run: brew install coreutils
- name: Test with most recent ponyc release
run: |
export PATH="/tmp/ponyc/bin/:$PATH"
make test
21 changes: 21 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,26 @@ jobs:
env:
CLOUDSMITH_API_KEY: ${{ secrets.CLOUDSMITH_API_KEY }}

arm64-apple-darwin-release:
name: Build and upload arm64-apple-darwin-release to Cloudsmith
runs-on: macos-14
needs:
- pre-artefact-creation
steps:
- uses: actions/checkout@v3
- name: install ponyc
run: bash .ci-scripts/macOS-arm64-install-pony-tools.bash nightly
- name: brew install dependencies
run: brew install coreutils
- name: pip install dependencies
run: pip3 install --upgrade cloudsmith-cli
- name: Build and upload
run: |
export PATH="/tmp/ponyc/bin/:/Library/Frameworks/Python.framework/Versions/3.11/bin/:$PATH"
bash .ci-scripts/release/arm64-apple-darwin-release.bash
env:
CLOUDSMITH_API_KEY: ${{ secrets.CLOUDSMITH_API_KEY }}

x86-64-pc-windows-msvc-release:
name: Build and upload x86-64-pc-windows-msvc-release to Cloudsmith
runs-on: windows-2022
Expand Down Expand Up @@ -121,6 +141,7 @@ jobs:
- x86-64-unknown-linux-release
- x86-64-pc-windows-msvc-release
- x86-64-apple-darwin-release
- arm64-apple-darwin-release
- build-release-docker-images
- generate-documentation
steps:
Expand Down
5 changes: 5 additions & 0 deletions .release-notes/m1-again.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
## Add MacOS on Apple Silicon as a fully supported platform

In August of 2023, we had to drop MacOS on Apple Silicon as we lost our build environment when we switched off of CirrusCI to GitHub Actions. GitHub just added MacOS Apple Silicon build environments, so we are bring back MacOS on Apple Silicon as a fully supported platform.

corral is once again available as a compiled arm64 MacOS binary.
Loading