Skip to content

Forward port v0.11.9 branch commits to main#7745

Merged
jedevc merged 6 commits intomainfrom
bump-engine
Jun 25, 2024
Merged

Forward port v0.11.9 branch commits to main#7745
jedevc merged 6 commits intomainfrom
bump-engine

Conversation

@github-actions
Copy link
Contributor

@github-actions github-actions bot commented Jun 24, 2024

(edits from sipsma)

As mentioned in the comment below, ended up having to manually make the bump PR for the release-v0.11.9 branch since this automated PR doesn't handle that whole non-main-branch workflow yet.

There were a few other commits from that branch that needed forward-porting, so I'm just reusing this PR for all of them. They are all cherry-picked from that branch (though needed some manual conflict resolution for a few files due to divergence on main, so not exact diff match).

Also snuck in a fix to CHANGELOG.md for the PR link, which was pointed out after the release to be to the wrong PR.

@sipsma sipsma changed the base branch from main to release-v0.11.9 June 24, 2024 23:31
@sipsma
Copy link
Contributor

sipsma commented Jun 24, 2024

This PR isn't exactly what we wanted due to the fact that we are creating a release off a patch branch for the first time. We do want this PR to end up in main, but first want this sdk bump to get merged into the release-v0.11.9 branch.

For now, will just go manually create that separately and come back to this PR once the release is done.

@sipsma sipsma changed the base branch from release-v0.11.9 to main June 24, 2024 23:39
@sipsma sipsma changed the title sdk: Bump engine dependency to v0.11.9 Forward port v0.11.9 branch commits to main Jun 25, 2024
@sipsma sipsma marked this pull request as ready for review June 25, 2024 03:17
@sipsma sipsma requested review from a team as code owners June 25, 2024 03:17
sipsma and others added 6 commits June 24, 2024 20:23
Signed-off-by: Erik Sipsma <erik@sipsma.dev>
Signed-off-by: Dagger CI <hello@dagger.io>
Signed-off-by: Erik Sipsma <erik@sipsma.dev>
Signed-off-by: Erik Sipsma <erik@sipsma.dev>
Signed-off-by: Erik Sipsma <erik@sipsma.dev>
Signed-off-by: Erik Sipsma <erik@sipsma.dev>
@sipsma sipsma requested review from jedevc and vito June 25, 2024 03:36
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.

2 participants