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

Example Tagging Release #351

Merged
merged 2 commits into from
Nov 5, 2024

Conversation

davidvonthenen
Copy link
Contributor

@davidvonthenen davidvonthenen commented Nov 4, 2024

Proposed changes

Document actual git commands for performing a release.

Types of changes

What types of changes does your code introduce to the community .NET SDK?
Put an x in the boxes that apply

  • Bugfix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • Documentation update or tests (if none of the other choices apply)

Checklist

Put an x in the boxes that apply. You can also fill these out after creating the PR. If you're unsure about any of them, don't hesitate to ask. We're here to help! This is simply a reminder of what we are going to look for before merging your code.

  • I have read the CONTRIBUTING doc
  • I have lint'ed all of my code using repo standards
  • I have added tests that prove my fix is effective or that my feature works
  • I have added necessary documentation (if appropriate)

Further comments

NA

Summary by CodeRabbit

  • Documentation
    • Updated the release process document to include a new section on "Creating a Release" with detailed instructions.
    • Added a subsection on "Creating a Release from a Release Branch" for patch releases.

Copy link
Contributor

coderabbitai bot commented Nov 4, 2024

Walkthrough

The pull request introduces updates to the .github/BRANCH_AND_RELEASE_PROCESS.md document by adding a new section titled "Creating a Release." This section details the steps for creating a release, including tagging and drafting a release on GitHub, along with command-line instructions. Additionally, a subsection called "Creating a Release from a Release Branch" describes the process for generating patch releases from a specific branch, maintaining the document's overall structure while enhancing clarity.

Changes

File Change Summary
.github/BRANCH_AND_RELEASE_PROCESS.md Added new section "Creating a Release" with instructions for tagging and creating releases.
Added subsection "Creating a Release from a Release Branch" detailing patch release steps.

Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media?

❤️ Share
🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>, please review it.
    • Generate unit testing code for this file.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai generate unit testing code for this file.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
    • @coderabbitai read src/utils.ts and generate unit testing code.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
    • @coderabbitai help me debug CodeRabbit configuration file.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Other keywords and placeholders

  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
  • Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
  • Add @coderabbitai anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • Please see the configuration documentation for more information.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

Copy link
Contributor

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

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

Actionable comments posted: 3

🧹 Outside diff range and nitpick comments (3)
.github/BRANCH_AND_RELEASE_PROCESS.md (3)

93-94: Add prerequisite about upstream remote setup

The commands assume the upstream remote is configured, but this should be explicitly mentioned as a prerequisite.

Add this note before the commands:

+> **Note:** These commands assume you have already set up an `upstream` remote pointing to the main repository. If you haven't, run:
+> ```bash
+> git remote add upstream https://github.com/deepgram/deepgram-dotnet-sdk.git
+> ```
+
🧰 Tools
🪛 LanguageTool

[uncategorized] ~93-~93: Possible missing comma found.
Context: ... commands to execute at the root of the repository assuming you are on your fork: ```bash...

(AI_HYDRA_LEO_MISSING_COMMA)


125-126: Add guidance on release branch creation

The section explains how to use release branches but doesn't mention when and how to create them.

Consider adding:

While we don't have a formal requirement for supporting past releases (ie currently on `v3` but need a patch on `v2`), there are times when you need to provide a patch release for things like security fixes. To create that patch releases, you do something similar as you would have done on main, but on the `release-v[0-9]+/*` branch.

+To create a new release branch:
+```bash
+git checkout main
+git checkout -b release-v3
+git push upstream release-v3
+```
+

93-93: Add missing comma

Add a comma for better readability.

-If you haven't done this before, these are the typicial commands to execute at the root of the repository assuming you are on your fork:
+If you haven't done this before, these are the typicial commands to execute at the root of the repository, assuming you are on your fork:
🧰 Tools
🪛 LanguageTool

[uncategorized] ~93-~93: Possible missing comma found.
Context: ... commands to execute at the root of the repository assuming you are on your fork: ```bash...

(AI_HYDRA_LEO_MISSING_COMMA)

📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL

📥 Commits

Reviewing files that changed from the base of the PR and between 86b27b7 and 4329da9.

📒 Files selected for processing (1)
  • .github/BRANCH_AND_RELEASE_PROCESS.md (1 hunks)
🧰 Additional context used
🪛 LanguageTool
.github/BRANCH_AND_RELEASE_PROCESS.md

[uncategorized] ~93-~93: Possible missing comma found.
Context: ... commands to execute at the root of the repository assuming you are on your fork: ```bash...

(AI_HYDRA_LEO_MISSING_COMMA)

.github/BRANCH_AND_RELEASE_PROCESS.md Show resolved Hide resolved
.github/BRANCH_AND_RELEASE_PROCESS.md Show resolved Hide resolved
.github/BRANCH_AND_RELEASE_PROCESS.md Outdated Show resolved Hide resolved
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
Copy link
Contributor

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

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

Actionable comments posted: 2

📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL

📥 Commits

Reviewing files that changed from the base of the PR and between 4329da9 and 7f80135.

📒 Files selected for processing (1)
  • .github/BRANCH_AND_RELEASE_PROCESS.md (1 hunks)
🔇 Additional comments (1)
.github/BRANCH_AND_RELEASE_PROCESS.md (1)

137-140: 🛠️ Refactor suggestion

Add security backporting instructions.

For security fixes, it's crucial to ensure changes are also applied to the main branch.

 # create a new tag following semver
 git tag -m 3.4.3 3.4.3
+# verify the tag
+git show 3.4.3
 git push upstream 3.4.3
+
+# For security fixes, ensure changes are backported to main
+git checkout main
+git pull upstream main
+git cherry-pick <commit-hash>  # or create a PR to merge from release-v3
+git push upstream main

Likely invalid or redundant comment.

Comment on lines +95 to +106
```bash
# get the latest everything and update your fork
git checkout main
git pull --rebase upstream main
git push
git fetch upstream --tags
git push origin --tags

# create a new tag following semver
git tag -m <version> <version>
git push upstream <version>
```
Copy link
Contributor

Choose a reason for hiding this comment

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

🛠️ Refactor suggestion

Add safety checks and verification steps to the release process.

The commands are correct but could benefit from additional safety measures:

 ```bash
 # get the latest everything and update your fork
 git checkout main
+# ensure we are up-to-date and there are no uncommitted changes
+git status
 git pull --rebase upstream main
 git push
 git fetch upstream --tags
 git push origin --tags

 # create a new tag following semver
 git tag -m <version> <version>
+# verify the tag was created correctly
+git show <version>
 git push upstream  <version>
+# verify the tag was pushed successfully
+git ls-remote --tags upstream

<!-- This is an auto-generated comment by CodeRabbit -->

Comment on lines +125 to +126
While we don't have a formal requirement for supporting past releases (ie currently on `v3` but need a patch on `v2`), there are times when you need to provide a patch release for things like security fixes. To create that patch releases, you do something similar as you would have done on main, but on the `release-v[0-9]+/*` branch.

Copy link
Contributor

Choose a reason for hiding this comment

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

🛠️ Refactor suggestion

Clarify security implications and patch release criteria.

The explanation of when to create patch releases could be more specific about security implications.

-While we don't have a formal requirement for supporting past releases (ie currently on `v3` but need a patch on `v2`), there are times when you need to provide a patch release for things like security fixes. To create that patch releases, you do something similar as you would have done on main, but on the `release-v[0-9]+/*` branch.
+While we don't have a formal requirement for supporting past releases (ie currently on `v3` but need a patch on `v2`), patch releases should be created in specific circumstances:
+1. Critical security vulnerabilities that affect user safety
+2. Severe bugs that impact core functionality
+3. Dependency updates addressing known vulnerabilities
+
+To create these patch releases, follow the same process as main but on the `release-v[0-9]+/*` branch.
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
While we don't have a formal requirement for supporting past releases (ie currently on `v3` but need a patch on `v2`), there are times when you need to provide a patch release for things like security fixes. To create that patch releases, you do something similar as you would have done on main, but on the `release-v[0-9]+/*` branch.
While we don't have a formal requirement for supporting past releases (ie currently on `v3` but need a patch on `v2`), patch releases should be created in specific circumstances:
1. Critical security vulnerabilities that affect user safety
2. Severe bugs that impact core functionality
3. Dependency updates addressing known vulnerabilities
To create these patch releases, follow the same process as main but on the `release-v[0-9]+/*` branch.

@davidvonthenen davidvonthenen merged commit db9a7dc into deepgram:main Nov 5, 2024
5 checks passed
@davidvonthenen davidvonthenen deleted the example-tag-release branch November 5, 2024 17:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants