Skip to content

[pull] main from renovatebot:main #133

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
pull merged 3 commits into from
May 11, 2025
Merged

[pull] main from renovatebot:main #133

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
455db42
fix(manager/pep621): use `depName` in lock update commands (#35855)
RahulGautamSingh May 11, 2025
ec019b6
fix(deps): update ghcr.io/renovatebot/base-image docker tag to v9.64.…
renovate[bot] May 11, 2025
d21d099
fix(versioning/npm): widen upper bound correctly (#35857)
RahulGautamSingh May 11, 2025
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
4 changes: 2 additions & 2 deletions lib/modules/manager/pep621/processors/uv.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -472,8 +472,8 @@ describe('modules/manager/pep621/processors/uv', () => {
const updatedDeps = [
{ packageName: 'dep1', depType: depTypes.dependencies },
{ packageName: 'dep2', depType: depTypes.dependencies },
{ depName: 'group1/dep3', depType: depTypes.optionalDependencies },
{ depName: 'group1/dep4', depType: depTypes.optionalDependencies },
{ depName: 'dep3', depType: depTypes.optionalDependencies },
{ depName: 'dep4', depType: depTypes.optionalDependencies },
{ depName: 'dep5', depType: depTypes.uvDevDependencies },
{ depName: 'dep6', depType: depTypes.uvDevDependencies },
{ depName: 'dep7', depType: depTypes.buildSystemRequires },
Expand Down
2 changes: 1 addition & 1 deletion lib/modules/manager/pep621/processors/uv.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@ function generateCMD(updatedDeps: Upgrade[]): string {
for (const dep of updatedDeps) {
switch (dep.depType) {
case depTypes.optionalDependencies: {
deps.push(dep.depName!.split('/')[1]);
deps.push(dep.depName!);
break;
}
case depTypes.uvDevDependencies:
Expand Down
1 change: 1 addition & 0 deletions lib/modules/versioning/npm/index.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,7 @@ describe('modules/versioning/npm/index', () => {
${'1.*'} | ${'replace'} | ${'1.0.0'} | ${'2.1.0'} | ${'2.*'}
${'~0.6.1'} | ${'replace'} | ${'0.6.8'} | ${'0.7.0-rc.2'} | ${'~0.7.0-rc'}
${'>= 0.1.21 < 0.2.0'} | ${'bump'} | ${'0.1.21'} | ${'0.1.24'} | ${'>= 0.1.24 < 0.2.0'}
${'>= 0.1.21 < 0.2.0'} | ${'widen'} | ${'0.1.21'} | ${'0.2.0'} | ${'>= 0.1.21 < 0.3.0'}
${'>= 0.1.21 <= 0.2.0'} | ${'bump'} | ${'0.1.21'} | ${'0.1.24'} | ${'>= 0.1.24 <= 0.2.0'}
${'>= 0.0.1 <= 0.1'} | ${'bump'} | ${'0.0.1'} | ${'0.0.2'} | ${'>= 0.0.2 <= 0.1'}
${'>= 0.0.1 < 0.1'} | ${'bump'} | ${'0.1.0'} | ${'0.2.1'} | ${'>= 0.2.1 < 0.3'}
Expand Down
3 changes: 3 additions & 0 deletions lib/modules/versioning/npm/range.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,6 +219,9 @@ export function getNewValue({
if (currentValue.endsWith('.0.0')) {
const newMajor = toVersionMajor + 1;
res = `<${newMajor}.0.0`;
} else if (currentValue.endsWith('.0')) {
const newMinor = toVersionMinor + 1;
res = `<${toVersionMajor}.${newMinor}${element.patch ? '.0' : ''}`;
} else if (element.patch) {
// TODO: types (#22198)
res = `<${increment(newVersion, 'patch')!}`;
Expand Down
6 changes: 3 additions & 3 deletions tools/docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,19 @@ ARG BASE_IMAGE_TYPE=slim
# --------------------------------------
# slim image
# --------------------------------------
FROM ghcr.io/renovatebot/base-image:9.64.7@sha256:5d1b35473fef5649df954aea48613fe172b4280297f21bd9c46f708e77267636 AS slim-base
FROM ghcr.io/renovatebot/base-image:9.64.8@sha256:a7b9857e80a9369e7f403583d917b5275adecd99820278f918557c83cadb5d77 AS slim-base

# --------------------------------------
# full image
# --------------------------------------
FROM ghcr.io/renovatebot/base-image:9.64.7-full@sha256:5aaf3a5b15b7c9416101af14b790e6d35d15676cf8918874eed3c846843bc5aa AS full-base
FROM ghcr.io/renovatebot/base-image:9.64.8-full@sha256:5ca2a57aeb592727150a7eb959fa18b091e2fd039bf73fbdbf569b303b69a6c7 AS full-base

ENV RENOVATE_BINARY_SOURCE=global

# --------------------------------------
# build image
# --------------------------------------
FROM --platform=$BUILDPLATFORM ghcr.io/renovatebot/base-image:9.64.7@sha256:5d1b35473fef5649df954aea48613fe172b4280297f21bd9c46f708e77267636 AS build
FROM --platform=$BUILDPLATFORM ghcr.io/renovatebot/base-image:9.64.8@sha256:a7b9857e80a9369e7f403583d917b5275adecd99820278f918557c83cadb5d77 AS build

# We want a specific node version here
# renovate: datasource=github-releases packageName=containerbase/node-prebuild versioning=node
Expand Down
Loading