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

chore: do not use renovate to update protobuf #3190

Merged
merged 2 commits into from
Sep 11, 2024
Merged

Conversation

JoeWang1127
Copy link
Collaborator

@JoeWang1127 JoeWang1127 commented Sep 11, 2024

In this PR:

  • Do not use renovate to update protobuf version in gax-java/dependencies.properties.

We need to make sure the protobuf version in gax-java/dependency.properties (used by the self-service client) is compatible with protoc/protobuf version defined in the generator.

We'll manually change the version.

Verification:

export LOG_LEVEL=debug && npx --yes --package renovate -- renovate --platform=local

...
{
   "datasource": "maven",
   "depName": "com.google.protobuf:protobuf-bom",
   "currentValue": "3.25.4",
   "fileReplacePosition": 1523,
   "registryUrls": [
     "https://maven-central.storage-download.googleapis.com/maven2/",
     "https://maven-central.storage-download.googleapis.com/maven2",
     "https://repo1.maven.org/maven2",
     "https://repo.maven.apache.org/maven2"
   ],
   "depType": "import",
   "groupName": "protobuf.version",
   "editFile": "gapic-generator-java-pom-parent/pom.xml",
   "updates": [],
   "packageName": "com.google.protobuf:protobuf-bom",
   "skipReason": "disabled"
},

@JoeWang1127 JoeWang1127 changed the title chore: do not use renovate to update protobuf in dependency.properties chore: do not use renovate to update protobuf in dependencies.properties Sep 11, 2024
@JoeWang1127 JoeWang1127 marked this pull request as ready for review September 11, 2024 17:37
Copy link
Member

@suztomo suztomo left a comment

Choose a reason for hiding this comment

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

This change seems to detach the version upgrade between the two files.

@suztomo
Copy link
Member

suztomo commented Sep 11, 2024

How about turning off Renovate for Protobuf?

@JoeWang1127
Copy link
Collaborator Author

This change seems to detach the version upgrade between the two files.

Do you mean gax-java/dependencies.properties and gapic-generator-java-pom-parent/pom.xml?

@blakeli0
Copy link
Collaborator

This change seems to detach the version upgrade between the two files.

I think we should detach the version upgrade between dependencies.properties and Dockerfile/pom. Because dependencies.properties is only used by self-service, and it should be in sync with the protoc version in WORKSPACE, which is not fully controlled by us. While the versions in Dockerfile/pom are used by full service(hermetic build), and it is fully controlled by us.

@blakeli0
Copy link
Collaborator

How about turning off Renovate for Protobuf?

I can see the benefit of still using renovate bot as a hint to us that there is new version for prorobuf, instead of us manually checking if there is a newer version for protobuf. But eventually it would need manual change to upgrade, so I think either way is fine as long as we have a regular schedule to upgrade protobuf.

@JoeWang1127
Copy link
Collaborator Author

using renovate bot as a hint to us that there is new version for prorobuf

The renovate pr can't bring code change since it comes from a fork, so I think it's fine to remove it from renovate.

@product-auto-label product-auto-label bot added the size: s Pull request size is small. label Sep 11, 2024
Copy link

sonarcloud bot commented Sep 11, 2024

Copy link

sonarcloud bot commented Sep 11, 2024

Quality Gate Passed Quality Gate passed for 'java_showcase_integration_tests'

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
0.0% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarCloud

Copy link
Contributor

@lqiu96 lqiu96 left a comment

Choose a reason for hiding this comment

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

LGTM. I think the title is probably outdated now, right?

@JoeWang1127 JoeWang1127 changed the title chore: do not use renovate to update protobuf in dependencies.properties chore: do not use renovate to update protobuf Sep 11, 2024
@JoeWang1127
Copy link
Collaborator Author

LGTM. I think the title is probably outdated now, right?

Thanks. Changed the title.

@JoeWang1127 JoeWang1127 merged commit 7996aab into main Sep 11, 2024
50 checks passed
@JoeWang1127 JoeWang1127 deleted the chore/modify-renovate branch September 11, 2024 20:34
ldetmer pushed a commit that referenced this pull request Sep 17, 2024
In this PR:
- Do not use renovate to update protobuf version in
`gax-java/dependencies.properties`.

We need to make sure the protobuf version in
`gax-java/dependency.properties` (used by the self-service client) is
compatible with protoc/protobuf version defined in the generator.

We'll manually change the version.

Verification:

```
export LOG_LEVEL=debug && npx --yes --package renovate -- renovate --platform=local

...
{
   "datasource": "maven",
   "depName": "com.google.protobuf:protobuf-bom",
   "currentValue": "3.25.4",
   "fileReplacePosition": 1523,
   "registryUrls": [
     "https://maven-central.storage-download.googleapis.com/maven2/",
     "https://maven-central.storage-download.googleapis.com/maven2",
     "https://repo1.maven.org/maven2",
     "https://repo.maven.apache.org/maven2"
   ],
   "depType": "import",
   "groupName": "protobuf.version",
   "editFile": "gapic-generator-java-pom-parent/pom.xml",
   "updates": [],
   "packageName": "com.google.protobuf:protobuf-bom",
   "skipReason": "disabled"
},
```
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
size: s Pull request size is small.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants