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

chore(release): merge back release to edge #15844

Merged
merged 4 commits into from
Jul 31, 2024
Merged

chore(release): merge back release to edge #15844

merged 4 commits into from
Jul 31, 2024

Conversation

y3rsh
Copy link
Collaborator

@y3rsh y3rsh commented Jul 31, 2024

v7.5.0 into edge

Have approval on this PR then:

git switch release && git pull
git switch edge && git pull
git merge --no-ff  release -m 'chore(release): merge changes from v7.5.0 into edge' 
git log --oneline --decorate --graph -n10
git push origin edge

The dry run

There are no merge conflicts to resolve.

image

ecormany and others added 4 commits July 23, 2024 20:02
# Overview

Notes for 7.5.0 alpha and hopefully production.

# Test Plan

Check notes when updating to alpha builds.

# Changelog

The usual two notes files.

# Review requests

Accurate description of this version's sole feature addition?

# Risk assessment

nil.
## git cherry-pick 4f90e28


- #15413 was the edge PR
- This is the only commit needed in the 7.5.0 release to allow for the
new gripper model.
- There are no changes to buildroot, oe-core, or ot3-firmware

Co-authored-by: Alise Au <[email protected]>
## Overview

Update the release notes now that 7.4.0 is revoked and 7.5.0 will handle
the new gripper hardware and the support for the HEPA/UV.

Should we have a comment stating something about 7.4.0 being revoked?
## Address release notes feedback

> A slight change requested.

- do backticks work in this markdown?

---------

Co-authored-by: Ed Cormany <[email protected]>
@y3rsh y3rsh self-assigned this Jul 31, 2024
@y3rsh y3rsh requested review from a team as code owners July 31, 2024 13:49
@y3rsh y3rsh requested review from mjhuff and removed request for a team July 31, 2024 13:49
@y3rsh y3rsh merged commit 1da76e5 into edge Jul 31, 2024
202 of 209 checks passed
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.

3 participants