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

Regenerate api_pb2 after manual changes were added incorrectly in #5732 #5990

Merged
merged 1 commit into from
Dec 22, 2023

Conversation

jesserockz
Copy link
Member

What does this implement/fix?

Types of changes

  • 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)
  • Other

Related issue or feature (if applicable): fixes

Pull request in esphome-docs with documentation (if applicable): esphome/esphome-docs#

Test Environment

  • ESP32
  • ESP32 IDF
  • ESP8266
  • RP2040
  • BK72xx
  • RTL87xx

Example entry for config.yaml:

# Example config.yaml

Checklist:

  • The code change is tested and works locally.
  • Tests have been added to verify that the new code works (under tests/ folder).

If user exposed functionality or configuration variables are added/changed:

@probot-esphome
Copy link

Hey there @OttoWinter, mind taking a look at this pull request as it has been labeled with an integration (api) you are listed as a code owner for? Thanks!
(message by CodeOwnersMention)

@jesserockz
Copy link
Member Author

@kroimon did you manually update the api_pb_2 files in your PR #5732 instead of using the python script to auto generate them as per the file header?

I don't see any other way these line would have gone missing...

@jesserockz jesserockz added this to the 2023.12.3 milestone Dec 22, 2023
@jesserockz jesserockz merged commit bd6fa29 into dev Dec 22, 2023
51 checks passed
@jesserockz jesserockz deleted the jesserockz-2023-444 branch December 22, 2023 05:29
@jesserockz jesserockz mentioned this pull request Dec 22, 2023
@kroimon
Copy link
Contributor

kroimon commented Dec 22, 2023

Whoops,sorry...
I think I misunderstood your instructions here and generated the files using the scripts in the aioesphomeapi repository, then merged the changes manually to the esphome repository.
I still think it's confusing and error-prone that there are differences in the API definitions 🙈

@github-actions github-actions bot locked and limited conversation to collaborators Dec 24, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants