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

prepare for 1.1 release #850

Merged
merged 1 commit into from
May 14, 2024
Merged

prepare for 1.1 release #850

merged 1 commit into from
May 14, 2024

Conversation

rfratto
Copy link
Member

@rfratto rfratto commented May 14, 2024

No description provided.

@rfratto rfratto requested a review from mattdurham May 14, 2024 19:30
@rfratto rfratto added backport-to-agent:no PR should NOT be backported to the agent repo. backport release/v1.1 labels May 14, 2024
Copy link
Collaborator

@mattdurham mattdurham left a comment

Choose a reason for hiding this comment

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

LGTM

@rfratto rfratto enabled auto-merge (squash) May 14, 2024 19:31
@rfratto rfratto merged commit f780ecc into main May 14, 2024
20 checks passed
@rfratto rfratto deleted the prep-1.1 branch May 14, 2024 19:33
Copy link
Contributor

The backport to release/v1.1 failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new branch
git switch --create backport-850-to-release/v1.1 origin/release/v1.1
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x f780eccb59ca026bbaa68433151de7d7dd4bb549
# Push it to GitHub
git push --set-upstream origin backport-850-to-release/v1.1
git switch main
# Remove the local backport branch
git branch -D backport-850-to-release/v1.1

Then, create a pull request where the base branch is release/v1.1 and the compare/head branch is backport-850-to-release/v1.1.

rfratto added a commit that referenced this pull request May 14, 2024
(cherry picked from commit f780ecc)
rfratto added a commit that referenced this pull request May 14, 2024
(cherry picked from commit f780ecc)
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Jun 14, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants