chore(release): Merge changes from v7.4.0 into edge #15773
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…fety_relay_inactive error (#15311)
# Overview Indicate that 7.4.0 adds support for HEPA/UV. # Test Plan Check in-app after alpha 0 tag is cut. # Changelog app-shell and api notes. # Risk assessment nil
…5536) closes https://opentrons.atlassian.net/browse/RESC-287 --------- Co-authored-by: Max Marrone <[email protected]> Co-authored-by: Edward Cormany <[email protected]> Co-authored-by: Sanniti Pimpley <[email protected]>
## `cherry-pick` 246efcb Must update `chore_release-7.4.0` so that windows builds work and we may test an update. To understand the changes see #15718 Co-authored-by: Seth Foster <[email protected]>
…5741) ## `cherry-pick` afaa717 Must update `chore_release-7.4.0` so that Linux app builds work due to a change in setuptools. To understand the changes see #15717 Co-authored-by: Ryan Howard <[email protected]>
…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.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
v7.4.0 into edge
Edit - need to resolve conflict, will just
git checkout edge -- app-shell/scripts/windows-custom-sign.jsHave approval on this PR then:
When you run this merge the only files that change are:
api/release-notes.mdapp-shell/build/release-notes.md