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

Support macOS ARM alongside macOS Intel and upgrade Protobuf library #233

Merged
merged 1 commit into from
Apr 26, 2024

Conversation

cretz
Copy link
Member

@cretz cretz commented Apr 26, 2024

What was changed

  • Add macos-intel and macos-arm both as separate CI targets
  • Switch to building binaries and doing smoke test on macos-arm properly instead of cross compile
    • This was tested in "draft mode" of this PR, then changed back to its normal state of not running on every PR
  • Update protobuf library and update protoc expectation and regenerate protobufs with the newer protoc

Branch protection will be updated upon approval

Checklist

  1. Closes [Feature Request] Use macOS M1/ARM runners for all SDK CI #210

@cretz cretz force-pushed the macos-arm branch 5 times, most recently from b4eda55 to 74d5f6a Compare April 26, 2024 13:40
@cretz cretz changed the title Support macOS ARM alongside macOS Intel Support macOS ARM alongside macOS Intel and upgrade Protobuf library Apr 26, 2024
@cretz cretz force-pushed the macos-arm branch 2 times, most recently from b93b529 to d6de786 Compare April 26, 2024 14:35
@cretz cretz requested a review from a team April 26, 2024 14:56
@cretz cretz marked this pull request as ready for review April 26, 2024 14:56
with:
# TODO(cretz): Upgrade when https://github.com/arduino/setup-protoc/issues/33 fixed
version: '3.x'
# TODO(cretz): Can upgrade proto when https://github.com/arduino/setup-protoc/issues/99 fixed
Copy link
Contributor

@mjameswh mjameswh Apr 26, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not very important, but I'm a bit puzzled by this TODO. Looks like the issue is about the default version of protoc that setup-protoc will install. But if you specify the version number explicitly, there should be no problem, no?

Copy link
Member Author

@cretz cretz Apr 26, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like this is about the default version of protoc that setup-protoc will install.

We want to pin our protoc version (different versions can generate different code). This is just saying we can't upgrade past 23.x because of that issue (though may be indirectly because of it, but I tried "27.x" here and it failed)

Copy link
Contributor

@mjameswh mjameswh left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@cretz cretz merged commit f1b8dde into temporalio:main Apr 26, 2024
7 checks passed
@cretz cretz deleted the macos-arm branch April 26, 2024 15:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[Feature Request] Use macOS M1/ARM runners for all SDK CI
3 participants