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

fix: create a GitHub token for the release process #4195

Merged
merged 1 commit into from
Oct 16, 2024

Conversation

javiermolinar
Copy link
Contributor

@javiermolinar javiermolinar commented Oct 16, 2024

What this PR does:
Fix the release process by uploading the binaries to GitHub

#4194

Checklist

  • Tests updated
  • Documentation added
  • CHANGELOG.md updated - the order of entries should be [CHANGE], [FEATURE], [ENHANCEMENT], [BUGFIX]

@javiermolinar javiermolinar merged commit 551bd0d into grafana:main Oct 16, 2024
16 checks passed
@mapno mapno added the type/bug Something isn't working label Oct 16, 2024
Copy link
Contributor

The backport to release-v2.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-4195-to-release-v2.6 origin/release-v2.6
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x 551bd0d9571f38cad85e8405760e7346b6a2c2a4

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-4195-to-release-v2.6
# Create the PR body template
PR_BODY=$(gh pr view 4195 --json body --template 'Backport 551bd0d9571f38cad85e8405760e7346b6a2c2a4 from #4195{{ "\n\n---\n\n" }}{{ index . "body" }}')
# Create the PR on GitHub
echo "${PR_BODY}" | gh pr create --title '[release-v2.6] fix: create a GitHub token for the release process' --body-file - --label 'type/bug' --label 'backport' --base release-v2.6 --milestone release-v2.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-4195-to-release-v2.6

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

# Remove the local backport branch
git switch main
git branch -D backport-4195-to-release-v2.6

joe-elliott pushed a commit that referenced this pull request Oct 16, 2024
javiermolinar pushed a commit that referenced this pull request Oct 17, 2024
)

* create a GitHub token for the release process (#4195)

* use gcr secret for pulling image (#4197)

* use proper path to get tempo secrets (#4199)
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.

4 participants