Skip to content

feat: gather deployment git meta from the build server #2392

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

Merged
merged 1 commit into from
Aug 14, 2025
Merged

Conversation

myftija
Copy link
Member

@myftija myftija commented Aug 14, 2025

This PR adapts the deployment command to also evaluate build server env
variables when creating the git meta. The build server will initially
only support deployments triggered by the github app, but we might add
other git providers in the future.

Sticking to the GH actions naming convention for the env variables set
by the build server in favor of consistency.

This PR adapts the deployment command to also evaluate build server env
variables when creating the git meta. The build server will initially
only support deployments triggered by the github app, but we might add
other git providers in the future.

Sticking to the GH actions naming convention for the env variables set
by the build server in favor of consistency.
Copy link

changeset-bot bot commented Aug 14, 2025

⚠️ No Changeset found

Latest commit: 4f555ae

Merging this PR will not cause a version bump for any packages. If these changes should not result in a new version, you're good to go. If these changes should result in a version bump, you need to add a changeset.

Click here to learn what changesets are, and how to add one.

Click here if you're a maintainer who wants to add a changeset to this PR

Copy link
Contributor

coderabbitai bot commented Aug 14, 2025

Walkthrough

  • Adds GitHub App support in CLI git metadata utilities: new isGitHubApp() and getGitHubAppMeta(), prioritized when TRIGGER_GITHUB_APP is true.
  • Reorders metadata source resolution: GitHub App, then GitHub Actions, then local origin.
  • Enhances local metadata with source: "local" and removes pullRequestNumber.
  • Removes pluckRemoteUrls helper; origin derived via existing methods.
  • Tightens GitHub Actions detection and normalizes refs; getGitHubActionsMeta now always returns a GitMeta.
  • Introduces consistent provider: "github" and source fields across all paths; includes ghUsername and ghUserAvatarUrl for GitHub App.
  • Extends GitMeta schema with optional provider, source, ghUsername, ghUserAvatarUrl.

Estimated code review effort

🎯 3 (Moderate) | ⏱️ ~20 minutes

Tip

🔌 Remote MCP (Model Context Protocol) integration is now available!

Pro plan users can now connect to remote MCP servers from the Integrations page. Connect with popular remote MCPs such as Notion and Linear to add more context to your reviews and chats.

✨ Finishing Touches
  • 📝 Generate Docstrings
🧪 Generate unit tests
  • Create PR with unit tests
  • Post copyable unit tests in a comment
  • Commit unit tests in branch gh-app-git-meta

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ 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.
    • 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.
  • 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 the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.

Support

Need help? Create a ticket on our support page for assistance with any issues or questions.

CodeRabbit Commands (Invoked using PR/Issue comments)

Type @coderabbitai help to get the list of available commands.

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

Status, Documentation and Community

  • Visit our Status Page to check the current availability of CodeRabbit.
  • 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: 1

🔭 Outside diff range comments (1)
packages/cli-v3/src/utilities/gitMeta.ts (1)

117-188: Validate GITHUB_SHA format in getGitHubActionsMeta

I searched the repo and found no existing SHA-format validation. Add a small regex check in packages/cli-v3/src/utilities/gitMeta.ts (getGitHubActionsMeta).

  • packages/cli-v3/src/utilities/gitMeta.ts — function getGitHubActionsMeta (approx. lines 117–188)

Suggested change:

 async function getGitHubActionsMeta(): Promise<GitMeta> {
   const remoteUrl =
     process.env.GITHUB_SERVER_URL && process.env.GITHUB_REPOSITORY
       ? `${process.env.GITHUB_SERVER_URL}/${process.env.GITHUB_REPOSITORY}.git`
       : undefined;
 
   // GITHUB_SHA and GITHUB_REF are both set in GH Actions CI
   const githubSha = process.env.GITHUB_SHA ?? "";
   const githubRef = process.env.GITHUB_REF ?? "";
+
+  // Validate SHA format (40 hex characters)
+  if (githubSha && !/^[a-f0-9]{40}$/i.test(githubSha)) {
+    console.debug(`Invalid GITHUB_SHA format: ${githubSha}`);
+  }
🧹 Nitpick comments (2)
packages/cli-v3/src/utilities/gitMeta.ts (2)

154-159: Remove or improve debug logging.

The git status debug output at line 154-159 appears to be leftover debugging code that may not be necessary in production.

-        await x("git", ["status"], {
-          nodeOptions: {
-            cwd: process.cwd(),
-          },
-        }).then((result) => console.debug(result.stdout));

220-268: Consider potential performance impact of git operations.

The getCommitMessage function performs multiple git operations that could fail or be slow, especially when fetching from remote. Consider adding timeouts and better error handling.

Consider implementing a timeout mechanism for git operations to prevent hanging:

 async function getCommitMessage(
   directory: string,
   sha: string,
   prNumber?: number
 ): Promise<string | undefined> {
+  const GIT_TIMEOUT_MS = 30000; // 30 seconds
+  
   try {
     // First try to fetch the specific commit
-    await x("git", ["fetch", "origin", sha], {
+    const fetchPromise = x("git", ["fetch", "origin", sha], {
       nodeOptions: {
         cwd: directory,
       },
     });
+    
+    // Add timeout
+    await Promise.race([
+      fetchPromise,
+      new Promise((_, reject) => 
+        setTimeout(() => reject(new Error('Git fetch timeout')), GIT_TIMEOUT_MS)
+      )
+    ]);

Additionally, consider caching the results to avoid repeated fetches for the same SHA.

📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro

💡 Knowledge Base configuration:

  • MCP integration is disabled by default for public repositories
  • Jira integration is disabled by default for public repositories
  • Linear integration is disabled by default for public repositories

You can enable these settings in your CodeRabbit configuration.

📥 Commits

Reviewing files that changed from the base of the PR and between 6f29b7d and 4f555ae.

📒 Files selected for processing (2)
  • packages/cli-v3/src/utilities/gitMeta.ts (5 hunks)
  • packages/core/src/v3/schemas/common.ts (1 hunks)
🧰 Additional context used
📓 Path-based instructions (2)
**/*.{ts,tsx}

📄 CodeRabbit Inference Engine (.github/copilot-instructions.md)

**/*.{ts,tsx}: Always prefer using isomorphic code like fetch, ReadableStream, etc. instead of Node.js specific code
For TypeScript, we usually use types over interfaces
Avoid enums
No default exports, use function declarations

Files:

  • packages/core/src/v3/schemas/common.ts
  • packages/cli-v3/src/utilities/gitMeta.ts
{packages/core,apps/webapp}/**/*.{ts,tsx}

📄 CodeRabbit Inference Engine (.github/copilot-instructions.md)

We use zod a lot in packages/core and in the webapp

Files:

  • packages/core/src/v3/schemas/common.ts
🧬 Code Graph Analysis (1)
packages/cli-v3/src/utilities/gitMeta.ts (1)
packages/core/src/v3/schemas/common.ts (2)
  • GitMeta (239-253)
  • GitMeta (255-255)
⏰ Context from checks skipped due to timeout of 90000ms. You can increase the timeout in your CodeRabbit configuration to a maximum of 15 minutes (900000ms). (23)
  • GitHub Check: units / internal / 🧪 Unit Tests: Internal (8, 8)
  • GitHub Check: units / internal / 🧪 Unit Tests: Internal (4, 8)
  • GitHub Check: units / internal / 🧪 Unit Tests: Internal (3, 8)
  • GitHub Check: units / internal / 🧪 Unit Tests: Internal (7, 8)
  • GitHub Check: e2e / 🧪 CLI v3 tests (windows-latest - pnpm)
  • GitHub Check: units / webapp / 🧪 Unit Tests: Webapp (7, 8)
  • GitHub Check: units / webapp / 🧪 Unit Tests: Webapp (5, 8)
  • GitHub Check: units / internal / 🧪 Unit Tests: Internal (5, 8)
  • GitHub Check: units / internal / 🧪 Unit Tests: Internal (1, 8)
  • GitHub Check: units / internal / 🧪 Unit Tests: Internal (6, 8)
  • GitHub Check: units / internal / 🧪 Unit Tests: Internal (2, 8)
  • GitHub Check: units / webapp / 🧪 Unit Tests: Webapp (6, 8)
  • GitHub Check: units / webapp / 🧪 Unit Tests: Webapp (3, 8)
  • GitHub Check: units / webapp / 🧪 Unit Tests: Webapp (8, 8)
  • GitHub Check: units / webapp / 🧪 Unit Tests: Webapp (4, 8)
  • GitHub Check: units / webapp / 🧪 Unit Tests: Webapp (1, 8)
  • GitHub Check: e2e / 🧪 CLI v3 tests (ubuntu-latest - pnpm)
  • GitHub Check: units / packages / 🧪 Unit Tests: Packages (1, 1)
  • GitHub Check: units / webapp / 🧪 Unit Tests: Webapp (2, 8)
  • GitHub Check: e2e / 🧪 CLI v3 tests (ubuntu-latest - npm)
  • GitHub Check: e2e / 🧪 CLI v3 tests (windows-latest - npm)
  • GitHub Check: typecheck / typecheck
  • GitHub Check: Analyze (javascript-typescript)
🔇 Additional comments (3)
packages/core/src/v3/schemas/common.ts (1)

238-243: LGTM! Well-structured GitMeta schema extensions.

The new optional fields are appropriately typed and maintain backward compatibility. The comment clearly explains why these fields are optional.

packages/cli-v3/src/utilities/gitMeta.ts (2)

8-15: LGTM! Clear prioritization of metadata sources.

The metadata source resolution order (GitHub App → GitHub Actions → local) is well-structured and aligns with the PR objectives.


108-115: Good improvement on GitHub Actions detection.

The additional checks for GITHUB_SHA and GITHUB_REF make the detection more robust and prevent false positives.

@myftija myftija merged commit 944b187 into main Aug 14, 2025
69 of 81 checks passed
@myftija myftija deleted the gh-app-git-meta branch August 14, 2025 14:07
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