Skip to content

Simplify renovate config #594

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.

Sign up for GitHub

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
Feb 6, 2025
Merged

Simplify renovate config #594

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 2 additions & 26 deletions .github/renovate.json5
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
{
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
"extends": [
"config:base"
"config:recommended",
Copy link
Member Author

Choose a reason for hiding this comment

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

config:recommended includes all of the groupings I deleted below

"customManagers:dockerfileVersions" // used by logging-k8s-stdout-otlp-json/Dockerfile
Copy link
Member Author

Choose a reason for hiding this comment

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

this should replace the customManager inlined below

],
"packageRules": [
{
Expand All @@ -17,36 +18,11 @@
// of that release instead of the unstable version for a future release
"ignoreUnstable": false
},
{
"matchPackagePrefixes": ["io.opentelemetry"],
"groupName": "opentelemetry packages"
},
{
"matchPackagePrefixes": ["ch.qos.logback:"],
"groupName": "logback packages"
},
{
"matchPackagePrefixes": ["com.google.protobuf"],
"groupName": "protobuf packages"
},
{
// intentionally using Java 11 in some examples
// not using matchUpdateTypes "major", because renovate wants to bump "11-jre" to "11.0.19_7-jre"
"matchPackageNames": ["eclipse-temurin"],
"enabled": false
}
],
"customManagers": [
{
"customType": "regex",
"description": "Update _VERSION variables in Dockerfiles",
"fileMatch": [
"(^|/|\\.)Dockerfile$",
"(^|/)Dockerfile\\.[^/]*$"
],
"matchStrings": [
"# renovate: datasource=(?<datasource>[a-z-]+?)(?: depName=(?<depName>.+?))? packageName=(?<packageName>.+?)(?: versioning=(?<versioning>[a-z-]+?))?\\s(?:ENV|ARG) .+?_VERSION=(?<currentValue>.+?)\\s"
]
}
]
}
2 changes: 1 addition & 1 deletion logging-k8s-stdout-otlp-json/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ FROM eclipse-temurin:21-jre
WORKDIR /usr/src/app/

# renovate: datasource=github-releases depName=opentelemetry-java-instrumentation packageName=open-telemetry/opentelemetry-java-instrumentation
ENV OPENTELEMETRY_JAVA_INSTRUMENTATION_VERSION=v2.12.0
ENV OPENTELEMETRY_JAVA_INSTRUMENTATION_VERSION=v2.11.0
Copy link
Member Author

Choose a reason for hiding this comment

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

I bumped this back a version in order to verify once this is merged that renovate is still finding and updating it


ADD build/libs/*SNAPSHOT.jar ./app.jar
ADD --chmod=644 https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/download/$OPENTELEMETRY_JAVA_INSTRUMENTATION_VERSION/opentelemetry-javaagent.jar ./opentelemetry-javaagent.jar
Expand Down
Loading