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

Build: don't run release builds on grafana/grafana repo #42785

Merged
merged 1 commit into from Dec 6, 2021

Conversation

malcolmholmes
Copy link
Contributor

What this PR does / why we need it:

Which issue(s) this PR fixes:

Fixes #

Special notes for your reviewer:

@malcolmholmes malcolmholmes requested review from a team and dsotirakis December 6, 2021 14:09
@grafanabot grafanabot added the type/ci Tasks related to Continuous Integration workflow label Dec 6, 2021
Copy link
Contributor

@dsotirakis dsotirakis left a comment

Choose a reason for hiding this comment

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

LGTM.

Let's try it and rollback the changes if needed

@malcolmholmes malcolmholmes merged commit b681871 into main Dec 6, 2021
@malcolmholmes malcolmholmes deleted the malcolmholmes/build-elsewhere branch December 6, 2021 14:30
@mckn mckn added old backport v8.2.x Mark PR for automatic backport to v8.2.x backport v8.3.x Mark PR for automatic backport to v8.3.x labels Dec 9, 2021
@grafanabot
Copy link
Contributor

The backport to v8.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-42785-to-v8.2.x origin/v8.2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x b6818718e9983fffd3351f4ab1545baba0e2b26f
# Push it to GitHub
git push --set-upstream origin backport-42785-to-v8.2.x
git switch main
# Remove the local backport branch
git branch -D backport-42785-to-v8.2.x

Then, create a pull request where the base branch is v8.2.x and the compare/head branch is backport-42785-to-v8.2.x.

@grafanabot
Copy link
Contributor

The backport to v8.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-42785-to-v8.3.x origin/v8.3.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x b6818718e9983fffd3351f4ab1545baba0e2b26f
# Push it to GitHub
git push --set-upstream origin backport-42785-to-v8.3.x
git switch main
# Remove the local backport branch
git branch -D backport-42785-to-v8.3.x

Then, create a pull request where the base branch is v8.3.x and the compare/head branch is backport-42785-to-v8.3.x.

mckn pushed a commit that referenced this pull request Dec 9, 2021
@mckn mckn removed the old backport v8.2.x Mark PR for automatic backport to v8.2.x label Dec 9, 2021
malcolmholmes added a commit that referenced this pull request Dec 9, 2021
* Build: don't run release builds on grafana/grafana repo (#42785)

(cherry picked from commit b681871)

* Build: Correct syntax for directing release builds (#42789)

(cherry picked from commit 6a5416b)

Co-authored-by: malcolmholmes <42545407+malcolmholmes@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport v8.3.x Mark PR for automatic backport to v8.3.x type/ci Tasks related to Continuous Integration workflow
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants