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.

Sign up for GitHub

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

Jump to bottom

Mac build cherry pick into chore release 7.4.0 #15747

Merged
merged 2 commits into from
Jul 22, 2024
Merged

Mac build cherry pick into chore release 7.4.0 #15747

merged 2 commits into from
Jul 22, 2024

Conversation

y3rsh
Copy link
Member

@y3rsh y3rsh commented Jul 22, 2024

shlokamin and others added 2 commits July 22, 2024 15:40
@shlokamin @y3rsh
ci(app-shell): update macos github runner version (#15559)
043bca7
@y3rsh
RQA-2830 fix mac dmg to be x64 binary and use x64 bundled python to p…
a77ffd7 
…ip install (#15624)

## Replaces #15618 with PR against branch name ending in
`app-build-internal` to trigger a build

## Overview

- <https://opentrons.atlassian.net/browse/RQA-2830>
- `macos-11` GitHub runner was intel and now we use macos-latest that is
arm
[doc](https://docs.github.com/en/actions/using-github-hosted-runners/about-github-hosted-runners/about-github-hosted-runners#standard-github-hosted-runners-for-public-repositories)
- specify --x64 argument to electron-builder
- ~~per
[doc](https://github.com/actions/setup-python?tab=readme-ov-file#supported-architectures)
x64 python should be installed so the pip install will be the right
platform. I'm not confident in this.~~
- see comment in #15618
- we need to use the python we download on mac to do the pip install so
the installed packages match the platform correctly

## Test Plan

- [x] build locally and see that it works
- [x] watch CI and install the built package
- [x] validate that once the package dmg is x64 that analysis works
(python has packages with the right arch)

# Review requests

- This the right approach?

# Risk assessment

High because our .dmg currently cannot analyze protocols 2.0.0-alpha.0
internal release build.
@y3rsh y3rsh self-assigned this Jul 22, 2024
@y3rsh y3rsh requested review from a team as code owners July 22, 2024 20:45
@y3rsh y3rsh requested review from ncdiehl11 and removed request for a team July 22, 2024 20:45
sfoster1
sfoster1 approved these changes Jul 22, 2024
View reviewed changes
Copy link
Member

@sfoster1 sfoster1 left a comment

Choose a reason for hiding this comment

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

Looks good but presumably fast-forward merge?

@y3rsh y3rsh merged commit a77ffd7 into chore_release-7.4.0 Jul 22, 2024
27 checks passed
@y3rsh y3rsh deleted the mac-build-cherry-pick-into-chore_release-7.4.0 branch July 22, 2024 21:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sfoster1 sfoster1 sfoster1 approved these changes

@ncdiehl11 ncdiehl11 Awaiting requested review from ncdiehl11 ncdiehl11 is a code owner automatically assigned from Opentrons/js

Assignees

@y3rsh y3rsh

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@y3rsh @sfoster1 @shlokamin