From 90a29fe94f0a7b54b6474c83fc6ec359432265d7 Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Tue, 11 Feb 2025 18:52:39 -0800 Subject: [PATCH 1/2] Less frequent Renovate --- .github/renovate.json5 | 8 +++++--- integration-tests/tracecontext/docker/Dockerfile | 4 ++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.github/renovate.json5 b/.github/renovate.json5 index a0db8fdf9da..a156b7264fd 100644 --- a/.github/renovate.json5 +++ b/.github/renovate.json5 @@ -7,10 +7,12 @@ ], "packageRules": [ { - // this is to reduce the number of renovate PRs by consolidating them into a weekly batch - "matchManagers": ["github-actions"], + // this is to reduce the number of renovate PRs + "matchManagers": [ + "github-actions" + ], "extends": ["schedule:weekly"], - "groupName": "github actions", + "groupName": "weekly update" }, { "matchPackageNames": [ diff --git a/integration-tests/tracecontext/docker/Dockerfile b/integration-tests/tracecontext/docker/Dockerfile index f54a9ba2cea..352b28e8382 100644 --- a/integration-tests/tracecontext/docker/Dockerfile +++ b/integration-tests/tracecontext/docker/Dockerfile @@ -1,4 +1,4 @@ -FROM python:3@sha256:589ed6659c0e4aac182f309131cd35e85452d21072570b1f6abc45b7687093a3 AS build +FROM python:3.13.1 # Main branch SHA as of April-1-2021 ARG TRACECONTEXT_GIT_TAG="dcd3ad9b7d6ac36f70ff3739874b73c11b0302a1" @@ -11,7 +11,7 @@ RUN unzip trace-context.zip RUN rm trace-context.zip RUN mv trace-context-${TRACECONTEXT_GIT_TAG}/test /tracecontext-testsuite -FROM python:3-slim@sha256:ae9f9ac89467077ed1efefb6d9042132d28134ba201b2820227d46c9effd3174 +FROM python:3.13.1-slim RUN pip install aiohttp From e8bdb9e8710b2dd18bf14f65b6b97c9feb1a89a1 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 15 Feb 2025 07:22:06 +0000 Subject: [PATCH 2/2] fix(deps): update dependency me.champeau.gradle:japicmp-gradle-plugin to v0.4.6 --- buildSrc/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index 6dfee8ff67a..6353ea0d11a 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -61,7 +61,7 @@ dependencies { implementation("com.squareup.wire:wire-gradle-plugin") implementation("gradle.plugin.com.google.protobuf:protobuf-gradle-plugin:0.8.18") implementation("gradle.plugin.io.morethan.jmhreport:gradle-jmh-report:0.9.6") - implementation("me.champeau.gradle:japicmp-gradle-plugin:0.4.5") + implementation("me.champeau.gradle:japicmp-gradle-plugin:0.4.6") implementation("me.champeau.jmh:jmh-gradle-plugin:0.7.3") implementation("net.ltgt.gradle:gradle-errorprone-plugin:4.1.0") implementation("net.ltgt.gradle:gradle-nullaway-plugin:2.2.0")