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 dashboard list play link #87807

Merged
merged 1 commit into from
May 14, 2024
Merged

Conversation

moxious
Copy link
Contributor

@moxious moxious commented May 14, 2024

part of a series of PRs

@moxious moxious added type/docs no-changelog Skip including change in changelog/release notes backport v10.2.x backport v10.3.x Mark PR for automatic backport to v10.3.x backport v10.4.x backport v11.0.x Mark PR for automatic backport to v11.0.x labels May 14, 2024
@moxious moxious requested a review from imatwawana as a code owner May 14, 2024 12:17
@grafana-delivery-bot grafana-delivery-bot bot added this to the 11.1.x milestone May 14, 2024
Copy link
Contributor

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

4 similar comments
Copy link
Contributor

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

Copy link
Contributor

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

Copy link
Contributor

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

Copy link
Contributor

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

@imatwawana imatwawana removed this from the 11.1.x milestone May 14, 2024
@imatwawana imatwawana added this to the 11.1.x milestone May 14, 2024
Copy link
Contributor

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

@imatwawana imatwawana merged commit 5678012 into main May 14, 2024
29 checks passed
@imatwawana imatwawana deleted the moxious-dashboardlist-play branch May 14, 2024 13:49
@ephemeral-instances-bot
Copy link

Error building instance: Contact #proj-ephemeral-hg-instances if it is not a compile error. Logs

Error message

handling pull request closed event: deleting instance by slug: unexpected response status: status=502 responseBody=

<title>502 Server Error</title>

Error: Server Error

The server encountered a temporary error and could not complete your request.

Please try again in 30 seconds.

Copy link
Contributor

The backport to v10.2.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-87807-to-v10.2.x origin/v10.2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x 5678012f0f7c542845eb1542edd0886e6ce9d66d

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-87807-to-v10.2.x
# Create the PR body template
PR_BODY=$(gh pr view 87807 --json body --template 'Backport 5678012f0f7c542845eb1542edd0886e6ce9d66d from #87807{{ "\n\n---\n\n" }}{{ index . "body" }}')
# Create the PR on GitHub
echo "${PR_BODY}" | gh pr create --title "[v10.2.x] docs: add dashboard list play link" --body-file - --label "type/docs" --label "no-changelog" --label "backport" --base v10.2.x --milestone 10.2.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-87807-to-v10.2.x

# Create a pull request where the `base` branch is `v10.2.x` and the `compare`/`head` branch is `backport-87807-to-v10.2.x`.

# Remove the local backport branch
git switch main
git branch -D backport-87807-to-v10.2.x

@grafana-delivery-bot grafana-delivery-bot bot added the backport-failed Failed to generate backport PR. Please resolve conflicts and create one manually. label May 14, 2024
Copy link
Contributor

The backport to v10.3.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-87807-to-v10.3.x origin/v10.3.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x 5678012f0f7c542845eb1542edd0886e6ce9d66d

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-87807-to-v10.3.x
# Create the PR body template
PR_BODY=$(gh pr view 87807 --json body --template 'Backport 5678012f0f7c542845eb1542edd0886e6ce9d66d from #87807{{ "\n\n---\n\n" }}{{ index . "body" }}')
# Create the PR on GitHub
echo "${PR_BODY}" | gh pr create --title "[v10.3.x] docs: add dashboard list play link" --body-file - --label "type/docs" --label "no-changelog" --label "backport" --base v10.3.x --milestone 10.3.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-87807-to-v10.3.x

# Create a pull request where the `base` branch is `v10.3.x` and the `compare`/`head` branch is `backport-87807-to-v10.3.x`.

# Remove the local backport branch
git switch main
git branch -D backport-87807-to-v10.3.x

Copy link
Contributor

The backport to v10.4.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-87807-to-v10.4.x origin/v10.4.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x 5678012f0f7c542845eb1542edd0886e6ce9d66d

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-87807-to-v10.4.x
# Create the PR body template
PR_BODY=$(gh pr view 87807 --json body --template 'Backport 5678012f0f7c542845eb1542edd0886e6ce9d66d from #87807{{ "\n\n---\n\n" }}{{ index . "body" }}')
# Create the PR on GitHub
echo "${PR_BODY}" | gh pr create --title "[v10.4.x] docs: add dashboard list play link" --body-file - --label "type/docs" --label "no-changelog" --label "backport" --base v10.4.x --milestone 10.4.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-87807-to-v10.4.x

# Create a pull request where the `base` branch is `v10.4.x` and the `compare`/`head` branch is `backport-87807-to-v10.4.x`.

# Remove the local backport branch
git switch main
git branch -D backport-87807-to-v10.4.x

grafana-delivery-bot bot pushed a commit that referenced this pull request May 14, 2024
imatwawana pushed a commit that referenced this pull request May 14, 2024
docs: add dashboard list play link (#87807)

(cherry picked from commit 5678012)

Co-authored-by: David Allen <david.allen@grafana.com>
imatwawana pushed a commit that referenced this pull request May 14, 2024
imatwawana pushed a commit that referenced this pull request May 14, 2024
imatwawana pushed a commit that referenced this pull request May 14, 2024
Copy link
Contributor

The backport to v10.4.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-87807-to-v10.4.x origin/v10.4.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x 5678012f0f7c542845eb1542edd0886e6ce9d66d

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-87807-to-v10.4.x
# Create the PR body template
PR_BODY=$(gh pr view 87807 --json body --template 'Backport 5678012f0f7c542845eb1542edd0886e6ce9d66d from #87807{{ "\n\n---\n\n" }}{{ index . "body" }}')
# Create the PR on GitHub
echo "${PR_BODY}" | gh pr create --title "[v10.4.x] docs: add dashboard list play link" --body-file - --label "type/docs" --label "no-changelog" --label "backport" --base v10.4.x --milestone 10.4.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-87807-to-v10.4.x

# Create a pull request where the `base` branch is `v10.4.x` and the `compare`/`head` branch is `backport-87807-to-v10.4.x`.

# Remove the local backport branch
git switch main
git branch -D backport-87807-to-v10.4.x

imatwawana added a commit that referenced this pull request May 14, 2024
docs: add dashboard list play link (#87807)

(cherry picked from commit 5678012)

Co-authored-by: David Allen <david.allen@grafana.com>
imatwawana added a commit that referenced this pull request May 14, 2024
docs: add dashboard list play link (#87807)

(cherry picked from commit 5678012)

Co-authored-by: David Allen <david.allen@grafana.com>
imatwawana added a commit that referenced this pull request May 14, 2024
docs: add dashboard list play link (#87807)

(cherry picked from commit 5678012)

Co-authored-by: David Allen <david.allen@grafana.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport v10.2.x backport v10.3.x Mark PR for automatic backport to v10.3.x backport v10.4.x backport v11.0.x Mark PR for automatic backport to v11.0.x backport-failed Failed to generate backport PR. Please resolve conflicts and create one manually. no-changelog Skip including change in changelog/release notes type/docs
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants