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: Apparently github broke docker compose: #3466

Merged
merged 1 commit into from
Aug 5, 2024

Conversation

simonswine
Copy link
Contributor

@simonswine simonswine marked this pull request as ready for review August 5, 2024 10:10
@simonswine simonswine requested a review from a team as a code owner August 5, 2024 10:10
@simonswine simonswine added type/bug Something isn't working backport release/v1.3 This label will backport a merged PR to the release/v1.3 branch backport release/v1.4 This label will backport a merged PR to the release/v1.4 branch backport release/v1.5 This label will backport a merged PR to the release/v1.5 branch backport release/v1.6 This label will backport a merged PR to the release/v1.6 branch backport release/v1.7 This label will backport a merged PR to the release/v1.7 branch labels Aug 5, 2024
Copy link
Contributor

github-actions bot commented Aug 5, 2024

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

4 similar comments
Copy link
Contributor

github-actions bot commented Aug 5, 2024

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

Copy link
Contributor

github-actions bot commented Aug 5, 2024

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

Copy link
Contributor

github-actions bot commented Aug 5, 2024

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

Copy link
Contributor

github-actions bot commented Aug 5, 2024

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

@simonswine
Copy link
Contributor Author

Pull this into the weekly of this week already.

Should be backported everywhere, to not block a bugfix

@simonswine simonswine merged commit bdc0079 into grafana:main Aug 5, 2024
24 checks passed
Copy link
Contributor

github-actions bot commented Aug 5, 2024

The backport to release/v1.3 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-3466-to-release/v1.3 origin/release/v1.3
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x bdc0079ac2b71b62a2ed9e87e89abb1bb7af59b6

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-3466-to-release/v1.3
# Create the PR body template
PR_BODY=$(gh pr view 3466 --json body --template 'Backport bdc0079ac2b71b62a2ed9e87e89abb1bb7af59b6 from #3466{{ "\n\n---\n\n" }}{{ index . "body" }}')
# Create the PR on GitHub
echo "${PR_BODY}" | gh pr create --title '[release/v1.3] chore: Apparently github broke docker compose:' --body-file - --label 'type/bug' --label 'backport' --base release/v1.3 --milestone release/v1.3 --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-3466-to-release/v1.3

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

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

Copy link
Contributor

github-actions bot commented Aug 5, 2024

The backport to release/v1.4 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-3466-to-release/v1.4 origin/release/v1.4
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x bdc0079ac2b71b62a2ed9e87e89abb1bb7af59b6

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-3466-to-release/v1.4
# Create the PR body template
PR_BODY=$(gh pr view 3466 --json body --template 'Backport bdc0079ac2b71b62a2ed9e87e89abb1bb7af59b6 from #3466{{ "\n\n---\n\n" }}{{ index . "body" }}')
# Create the PR on GitHub
echo "${PR_BODY}" | gh pr create --title '[release/v1.4] chore: Apparently github broke docker compose:' --body-file - --label 'type/bug' --label 'backport' --base release/v1.4 --milestone release/v1.4 --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-3466-to-release/v1.4

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

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

Copy link
Contributor

github-actions bot commented Aug 5, 2024

The backport to release/v1.5 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-3466-to-release/v1.5 origin/release/v1.5
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x bdc0079ac2b71b62a2ed9e87e89abb1bb7af59b6

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-3466-to-release/v1.5
# Create the PR body template
PR_BODY=$(gh pr view 3466 --json body --template 'Backport bdc0079ac2b71b62a2ed9e87e89abb1bb7af59b6 from #3466{{ "\n\n---\n\n" }}{{ index . "body" }}')
# Create the PR on GitHub
echo "${PR_BODY}" | gh pr create --title '[release/v1.5] chore: Apparently github broke docker compose:' --body-file - --label 'type/bug' --label 'backport' --base release/v1.5 --milestone release/v1.5 --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-3466-to-release/v1.5

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

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

Copy link
Contributor

github-actions bot commented Aug 5, 2024

The backport to release/v1.6 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-3466-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 bdc0079ac2b71b62a2ed9e87e89abb1bb7af59b6

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-3466-to-release/v1.6
# Create the PR body template
PR_BODY=$(gh pr view 3466 --json body --template 'Backport bdc0079ac2b71b62a2ed9e87e89abb1bb7af59b6 from #3466{{ "\n\n---\n\n" }}{{ index . "body" }}')
# Create the PR on GitHub
echo "${PR_BODY}" | gh pr create --title '[release/v1.6] chore: Apparently github broke docker compose:' --body-file - --label 'type/bug' --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-3466-to-release/v1.6

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

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

Copy link
Contributor

github-actions bot commented Aug 5, 2024

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

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-3466-to-release/v1.7
# Create the PR body template
PR_BODY=$(gh pr view 3466 --json body --template 'Backport bdc0079ac2b71b62a2ed9e87e89abb1bb7af59b6 from #3466{{ "\n\n---\n\n" }}{{ index . "body" }}')
# Create the PR on GitHub
echo "${PR_BODY}" | gh pr create --title '[release/v1.7] chore: Apparently github broke docker compose:' --body-file - --label 'type/bug' --label 'backport' --base release/v1.7 --milestone release/v1.7 --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-3466-to-release/v1.7

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

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

simonswine added a commit that referenced this pull request Aug 5, 2024
Related: actions/runner-images#9692
(cherry picked from commit bdc0079)

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 release/v1.3 This label will backport a merged PR to the release/v1.3 branch backport release/v1.4 This label will backport a merged PR to the release/v1.4 branch backport release/v1.5 This label will backport a merged PR to the release/v1.5 branch backport release/v1.6 This label will backport a merged PR to the release/v1.6 branch backport release/v1.7 This label will backport a merged PR to the release/v1.7 branch backport-failed type/bug Something isn't working
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants