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: update to latest release action #11808

Merged
merged 34 commits into from
Feb 20, 2024
Merged

Conversation

trevorwhitney
Copy link
Collaborator

Fixes the repo reference for the release actions

@trevorwhitney trevorwhitney requested a review from a team as a code owner January 26, 2024 22:08
@trevorwhitney trevorwhitney changed the title fix: release action repo reference feat: bring in latest release code Feb 13, 2024
@trevorwhitney trevorwhitney added type/docs Issues related to technical documentation; the Docs Squad uses this label across many repositories backport release-2.8.x backport release-2.9.x labels Feb 14, 2024
@github-actions github-actions bot removed the type/docs Issues related to technical documentation; the Docs Squad uses this label across many repositories label Feb 14, 2024
@grafanabot
Copy link
Collaborator

This PR must be merged before a backport PR will be created.

1 similar comment
@grafanabot
Copy link
Collaborator

This PR must be merged before a backport PR will be created.

@trevorwhitney trevorwhitney merged commit 65b3ec4 into main Feb 20, 2024
10 of 11 checks passed
@trevorwhitney trevorwhitney deleted the fix-action-names-in-main branch February 20, 2024 21:26
@grafanabot
Copy link
Collaborator

Hello @trevorwhitney!
Backport pull requests need to be either:

  • Pull requests which address bugs,
  • Urgent fixes which need product approval, in order to get merged,
  • Docs changes.

Please, if the current pull request addresses a bug fix, label it with the type/bug label.
If it already has the product approval, please add the product-approved label. For docs changes, please add the type/docs label.
If the pull request modifies CI behaviour, please add the type/ci label.
If none of the above applies, please consider removing the backport label and target the next major/minor release.
Thanks!

@grafanabot
Copy link
Collaborator

The backport to release-2.9.x 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-11808-to-release-2.9.x origin/release-2.9.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x 65b3ec441baec24a7e2abdec1d6d09792048e7d4

When the conflicts are resolved, stage and commit the changes:

git add . && git cherry-pick --continue

If you have the GitHub CLI installed:

# Push the branch to GitHub:
git push --set-upstream origin backport-11808-to-release-2.9.x
# Create the PR body template
PR_BODY=$(gh pr view 11808 --json body --template 'Backport 65b3ec441baec24a7e2abdec1d6d09792048e7d4 from #11808{{ "\n\n---\n\n" }}{{ index . "body" }}')
# Create the PR on GitHub
echo "${PR_BODY}" | gh pr create --title "[release-2.9.x] chore: update to latest release action" --body-file - --label "size/XXL" --label "product-approved" --label "backport" --base release-2.9.x --milestone release-2.9.x --web

Or, if you don't have the GitHub CLI installed (we recommend you install it!):

# Push the branch to GitHub:
git push --set-upstream origin backport-11808-to-release-2.9.x

# Create a pull request where the `base` branch is `release-2.9.x` and the `compare`/`head` branch is `backport-11808-to-release-2.9.x`.

# Remove the local backport branch
git switch main
git branch -D backport-11808-to-release-2.9.x

@grafanabot
Copy link
Collaborator

The backport to release-2.8.x 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-11808-to-release-2.8.x origin/release-2.8.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x 65b3ec441baec24a7e2abdec1d6d09792048e7d4

When the conflicts are resolved, stage and commit the changes:

git add . && git cherry-pick --continue

If you have the GitHub CLI installed:

# Push the branch to GitHub:
git push --set-upstream origin backport-11808-to-release-2.8.x
# Create the PR body template
PR_BODY=$(gh pr view 11808 --json body --template 'Backport 65b3ec441baec24a7e2abdec1d6d09792048e7d4 from #11808{{ "\n\n---\n\n" }}{{ index . "body" }}')
# Create the PR on GitHub
echo "${PR_BODY}" | gh pr create --title "[release-2.8.x] chore: update to latest release action" --body-file - --label "size/XXL" --label "product-approved" --label "backport" --base release-2.8.x --milestone release-2.8.x --web

Or, if you don't have the GitHub CLI installed (we recommend you install it!):

# Push the branch to GitHub:
git push --set-upstream origin backport-11808-to-release-2.8.x

# Create a pull request where the `base` branch is `release-2.8.x` and the `compare`/`head` branch is `backport-11808-to-release-2.8.x`.

# Remove the local backport branch
git switch main
git branch -D backport-11808-to-release-2.8.x

rhnasc pushed a commit to inloco/loki that referenced this pull request Apr 12, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants