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

pin proto-types to match proto pin #9999

Merged
merged 1 commit into from
Apr 22, 2024
Merged

pin proto-types to match proto pin #9999

merged 1 commit into from
Apr 22, 2024

Conversation

emmyoop
Copy link
Member

@emmyoop emmyoop commented Apr 22, 2024

Problem

protobuf is pinned to <4,>5 but protobuf-types is unpinned and can cause false type check failures as a result

Solution

protobuf-types pin should match to avoid false failures. Skipping changelog since this is just a dev dependency.

This should be backported through 1.5 to prevent false backport code check failures in the future

Checklist

  • I have read the contributing guide and understand what's expected of me
  • I have run this code in development and it appears to resolve the stated issue
  • This PR includes tests, or tests are not required/relevant for this PR
  • This PR has no interface changes (e.g. macros, cli, logs, json artifacts, config files, adapter interface, etc) or this PR has already received feedback and approval from Product or DX
  • This PR includes type annotations for new and modified functions

@emmyoop emmyoop added the Skip Changelog Skips GHA to check for changelog file label Apr 22, 2024
@emmyoop emmyoop requested a review from a team as a code owner April 22, 2024 15:48
@cla-bot cla-bot bot added the cla:yes label Apr 22, 2024
Copy link

codecov bot commented Apr 22, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 88.17%. Comparing base (0290cf7) to head (f550dee).

Additional details and impacted files
@@           Coverage Diff           @@
##             main    #9999   +/-   ##
=======================================
  Coverage   88.17%   88.17%           
=======================================
  Files         181      181           
  Lines       22614    22614           
=======================================
  Hits        19939    19939           
  Misses       2675     2675           
Flag Coverage Δ
integration 85.56% <ø> (-0.01%) ⬇️
unit 62.21% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@emmyoop emmyoop merged commit 528b95c into main Apr 22, 2024
72 checks passed
@emmyoop emmyoop deleted the er/pin-proto-types branch April 22, 2024 17:16
Copy link
Contributor

The backport to 1.7.latest 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 working tree
git worktree add .worktrees/backport-1.7.latest 1.7.latest
# Navigate to the new working tree
cd .worktrees/backport-1.7.latest
# Create a new branch
git switch --create backport-9999-to-1.7.latest
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 528b95cba8a730963efe343edad1ad19ebe42f7d
# Push it to GitHub
git push --set-upstream origin backport-9999-to-1.7.latest
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-1.7.latest

Then, create a pull request where the base branch is 1.7.latest and the compare/head branch is backport-9999-to-1.7.latest.

Copy link
Contributor

The backport to 1.6.latest 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 working tree
git worktree add .worktrees/backport-1.6.latest 1.6.latest
# Navigate to the new working tree
cd .worktrees/backport-1.6.latest
# Create a new branch
git switch --create backport-9999-to-1.6.latest
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 528b95cba8a730963efe343edad1ad19ebe42f7d
# Push it to GitHub
git push --set-upstream origin backport-9999-to-1.6.latest
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-1.6.latest

Then, create a pull request where the base branch is 1.6.latest and the compare/head branch is backport-9999-to-1.6.latest.

emmyoop added a commit that referenced this pull request Apr 22, 2024
# Conflicts:
#	dev-requirements.txt
emmyoop added a commit that referenced this pull request Apr 22, 2024
# Conflicts:
#	dev-requirements.txt
emmyoop added a commit that referenced this pull request Apr 22, 2024
# Conflicts:
#	dev-requirements.txt
emmyoop added a commit that referenced this pull request Apr 22, 2024
# Conflicts:
#	dev-requirements.txt
emmyoop added a commit that referenced this pull request Apr 22, 2024
# Conflicts:
#	dev-requirements.txt
emmyoop added a commit that referenced this pull request Apr 22, 2024
# Conflicts:
#	dev-requirements.txt
@aranke aranke mentioned this pull request Jul 12, 2024
5 tasks
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.

2 participants