Skip to content
This repository was archived by the owner on Sep 30, 2024. It is now read-only.

fix(release): remove generate-notes from github release creation#63121

Merged
burmudar merged 2 commits intomainfrom
wb-craig/fix-release-manifest
Jun 6, 2024
Merged

fix(release): remove generate-notes from github release creation#63121
burmudar merged 2 commits intomainfrom
wb-craig/fix-release-manifest

Conversation

@burmudar
Copy link
Contributor

@burmudar burmudar commented Jun 6, 2024

Generate notes currently generates a changelog all the way from the tag app-2023 ... which means the content is more than what is allowed by github - hard cap of 125000 characters.

Test plan

CI

Changelog

  • remove generate-notes cli flag when promoting releases
  • push only a single tag
  • fix token name used in changelog generation

@burmudar burmudar requested review from a team and craigfurman June 6, 2024 09:31
@burmudar burmudar self-assigned this Jun 6, 2024
@cla-bot cla-bot bot added the cla-signed label Jun 6, 2024
@burmudar burmudar changed the base branch from main to 5.4.5099 June 6, 2024 09:31
@burmudar burmudar changed the base branch from 5.4.5099 to main June 6, 2024 10:32
Copy link
Contributor

@craigfurman craigfurman left a comment

Choose a reason for hiding this comment

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

🚀

@burmudar burmudar force-pushed the wb-craig/fix-release-manifest branch from 29f2acd to 9f1b567 Compare June 6, 2024 10:33
@burmudar burmudar enabled auto-merge (squash) June 6, 2024 10:34
@burmudar burmudar merged commit 817738a into main Jun 6, 2024
@burmudar burmudar deleted the wb-craig/fix-release-manifest branch June 6, 2024 10:38
@craigfurman craigfurman added the backport 5.4.5099 label used to backport PRs to the 5.4.5099 release branch label Jun 6, 2024
@sourcegraph-release-bot
Copy link
Collaborator

The backport to 5.4.5099 failed at https://github.com/sourcegraph/sourcegraph/actions/runs/9401114335:

The process '/usr/bin/git' failed with exit code 1

To backport this PR manually, you can either:

Via the sg tool

Use the sg backport command to backport your commit to the release branch.

sg backport -r 5.4.5099 -p 63121
Via your terminal

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-5.4.5099 5.4.5099
# Navigate to the new working tree
cd .worktrees/backport-5.4.5099
# Create a new branch
git switch --create backport-63121-to-5.4.5099
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 817738a3ae98f0fc6e065388c2101dead32ae0d4
# Push it to GitHub
git push --set-upstream origin backport-63121-to-5.4.5099
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-5.4.5099

If you encouter conflict, first resolve the conflict and stage all files, then run the commands below:

git cherry-pick --continue
# Push it to GitHub
git push --set-upstream origin backport-63121-to-5.4.5099
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-5.4.5099
  • Follow above instructions to backport the commit.
  • Create a pull request where the base branch is 5.4.5099 and the compare/head branch is backport-63121-to-5.4.5099., click here to create the pull request.

Once the pull request has been created, please ensure the following:

  • Make sure to tag @sourcegraph/release in the pull request description.

  • kindly remove the release-blocker from this pull request.

@sourcegraph-release-bot sourcegraph-release-bot added backports release-blocker Prevents us from releasing: https://about.sourcegraph.com/handbook/engineering/releases failed-backport-to-5.4.5099 labels Jun 6, 2024
craigfurman pushed a commit that referenced this pull request Jun 7, 2024
…elease creation (#63121)

Generate notes currently generates a changelog all the way from the tag
`app-2023` ... which means the content is more than what is allowed by
github - hard cap of 125000 characters.

- remove `generate-notes` cli flag when promoting releases
- push only a single tag
- fix token name used in changelog generation

(cherry picked from commit 817738a)
@craigfurman
Copy link
Contributor

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

backport 5.4.5099 label used to backport PRs to the 5.4.5099 release branch backports cla-signed failed-backport-to-5.4.5099 release-blocker Prevents us from releasing: https://about.sourcegraph.com/handbook/engineering/releases

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants