fix(release): Use GitHub org membership for version calculation - #72
Merged
Conversation
The version calculation was filtering commits by author email domain (@carto.com, @cartodb.com), but some team members use personal emails. Changes: - Use GitHub API to fetch CartoDB org members - Filter commits by GitHub username instead of email - Fixed conventional commit regex to handle scopes: fix(scope): This ensures all CartoDB org member commits are counted regardless of what email they use for git commits.
Collaborator
Author
|
/gemini review |
The default GITHUB_TOKEN doesn't have read:org permission needed to fetch organization members list. Use X_GITHUB_SUPERCARTOFANTE PAT which has the required scope.
mateo-di
marked this pull request as ready for review
January 26, 2026 15:21
mateo-di
added a commit
that referenced
this pull request
Jan 29, 2026
Update CARTO file detection to use GitHub API org membership check, matching the approach in calculate_carto_version.sh (PR #72). Changes: - Resolver: Fetch CartoDB org members via `gh api orgs/CartoDB/members` - Resolver: Check commit authors against org member list - CI Fixer: Update docs to reference "CartoDB GitHub org members" - Docs: Update CARTO_CLAUDE.md with org membership reference This is more reliable than email domain matching because: - GitHub usernames are authoritative - Works for users with non-CARTO emails - Consistent with version calculator logic
mateo-di
added a commit
that referenced
this pull request
Jan 29, 2026
* feat: Implement CARTO-First resolution strategy for upstream syncs Add CARTO-FIRST conflict resolution priority that mandates preserving CARTO customizations made by CartoDB org members during upstream syncs. Key changes: - Resolver: Add pre-analysis step to identify CARTO-modified files - Resolver: Update prompt with CARTO-FIRST priority table (6 priorities) - Resolver: Add known CARTO customizations list (Azure, Snowflake, etc.) - CI Fixer: Add FORBIDDEN ACTIONS (never revert CARTO code) - CI Fixer: Add REQUIRED ACTIONS (fix tests, not CARTO code) - Docs: Update CARTO_CLAUDE.md with new resolution priorities The key insight is using `git log` to identify files with commits from @carto.com or @cartodb.com authors, then prioritizing those files. [sc-XXXXX] * fix: Use GitHub org membership check instead of email domains Update CARTO file detection to use GitHub API org membership check, matching the approach in calculate_carto_version.sh (PR #72). Changes: - Resolver: Fetch CartoDB org members via `gh api orgs/CartoDB/members` - Resolver: Check commit authors against org member list - CI Fixer: Update docs to reference "CartoDB GitHub org members" - Docs: Update CARTO_CLAUDE.md with org membership reference This is more reliable than email domain matching because: - GitHub usernames are authoritative - Works for users with non-CARTO emails - Consistent with version calculator logic * feat: Build rich CARTO context from ALL merged PRs for conflict resolution Replace simple PR listing with intelligent context building: - Fetch ALL merged PRs to carto/main (up to 1000, no arbitrary limit) - For each CARTO-modified conflicted file, show: - Which PRs modified it - PR title (what the change does) - Author and lines changed (+/-) - Summary from PR description (first 150 chars) - Provide full PR reference table sorted by recency Example context for Claude: ``` ### `litellm/llms/azure/chat/gpt_transformation.py` **2 CARTO PR(s) modified this file:** - PR #70: fix(azure): Strip operation suffixes from deployment URLs Author: @josemaria-vilaplana | +189/-1 lines - PR #61: fix: Azure Responses API URL construction Author: @josemaria-vilaplana | +77/-3 lines ``` This gives Claude full understanding of WHY each file was modified, enabling smarter conflict resolution decisions.
3 tasks
3 tasks
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
The version calculation script was filtering commits by author email domain (
@carto.com,@cartodb.com), but some team members (like Jose) use personal emails for git commits.Changes:
fix(azure):Before: Commits from
josemaria.vilaplana@gmail.comwere ignoredAfter: All commits from CartoDB GitHub org members are counted
Test plan
Tested locally:
Checklist