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

docs: Add parameters from otel-profiling-java #3444

Merged
merged 1 commit into from
Jul 24, 2024

Conversation

simonswine
Copy link
Contributor

@simonswine simonswine commented Jul 24, 2024

I would like to get rid of the rich READMEs and link everything into docs. This is something that our docs don't have.

I would like to get rid of the rich READMEs and link everything into
docs. This is something that our docs don't have.
@simonswine simonswine added type/docs Improvements for doc docs. Used by Docs team for project management backport release/v1.6 labels Jul 24, 2024
@simonswine simonswine marked this pull request as ready for review July 24, 2024 12:56
@simonswine simonswine requested review from a team as code owners July 24, 2024 12:56
Copy link
Contributor

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

Copy link
Collaborator

@korniltsev korniltsev left a comment

Choose a reason for hiding this comment

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

<3

@simonswine simonswine merged commit 126da8a into main Jul 24, 2024
20 checks passed
@simonswine simonswine deleted the 20240724_otel-profiling-java branch July 24, 2024 15:55
github-actions bot pushed a commit that referenced this pull request Jul 24, 2024
I would like to get rid of the rich READMEs and link everything into
docs. This is something that our docs don't have.

(cherry picked from commit 126da8a)
Copy link
Contributor

The backport to release/v1.6 failed:

Validation Failed: "Could not resolve to a node with the global id of 'T_kwDOAG3Mbc4AczmP'."

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new branch
git switch --create backport-3444-to-release/v1.6 origin/release/v1.6
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x 126da8a3058657f3ae27310144734f30902fedae

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-3444-to-release/v1.6
# Create the PR body template
PR_BODY=$(gh pr view 3444 --json body --template 'Backport 126da8a3058657f3ae27310144734f30902fedae from #3444{{ "\n\n---\n\n" }}{{ index . "body" }}')
# Create the PR on GitHub
echo "${PR_BODY}" | gh pr create --title '[release/v1.6] docs: Add parameters from otel-profiling-java' --body-file - --label 'type/docs' --label 'backport' --base release/v1.6 --milestone release/v1.6 --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-3444-to-release/v1.6

# Create a pull request where the `base` branch is `release/v1.6` and the `compare`/`head` branch is `backport-3444-to-release/v1.6`.

# Remove the local backport branch
git switch main
git branch -D backport-3444-to-release/v1.6

simonswine added a commit that referenced this pull request Jul 25, 2024
I would like to get rid of the rich READMEs and link everything into
docs. This is something that our docs don't have.

(cherry picked from commit 126da8a)

Co-authored-by: Christian Simon <simon@swine.de>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-failed type/docs Improvements for doc docs. Used by Docs team for project management
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants