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

fix(composer): resolve the lockFileMaintenance not working #32384

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 3 commits
Commits
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
6 changes: 5 additions & 1 deletion lib/modules/manager/bundler/artifacts.ts
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,10 @@ export async function updateArtifacts(

const commands: string[] = [];

if (config.isLockFileMaintenance) {
if (
config.updateType === 'lockFileMaintenance' ||
kayw-geek marked this conversation as resolved.
Show resolved Hide resolved
config.isLockFileMaintenance
) {
commands.push('bundler lock --update');
} else {
const bundlerUpgraded = updatedDeps
Expand Down Expand Up @@ -289,6 +292,7 @@ export async function updateArtifacts(
if (
recursionLimit > 0 &&
resolveMatches.length &&
config.updateType !== 'lockFileMaintenance' &&
!config.isLockFileMaintenance
) {
logger.debug(
Expand Down
2 changes: 1 addition & 1 deletion lib/modules/manager/composer/artifacts.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -725,8 +725,8 @@ describe('modules/manager/composer/artifacts', () => {
updatedDeps: [],
newPackageFileContent: '{}',
config: {
updateType: 'lockFileMaintenance',
...config,
isLockFileMaintenance: true,
},
}),
).toEqual([
Expand Down
4 changes: 3 additions & 1 deletion lib/modules/manager/composer/artifacts.ts
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,8 @@ export async function updateArtifacts({

const file = Json.pipe(PackageFile).parse(newPackageFileContent);

const isLockFileMaintenance =
config.updateType === 'lockFileMaintenance' || config.isLockFileMaintenance;
const lockFileName = packageFileName.replace(regEx(/\.json$/), '.lock');
const lockfile = await z
.string()
Expand Down Expand Up @@ -174,7 +176,7 @@ export async function updateArtifacts({

const cmd = 'composer';
let args: string;
if (config.isLockFileMaintenance) {
if (isLockFileMaintenance) {
args = 'update';
} else {
args =
Expand Down
6 changes: 4 additions & 2 deletions lib/modules/manager/gradle/artifacts.ts
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,8 @@ export async function updateArtifacts({
}

if (
config.isLockFileMaintenance &&
(config.updateType === 'lockFileMaintenance' ||
config.isLockFileMaintenance) &&
(!isGradleBuildFile(packageFileName) ||
dirname(packageFileName) !== dirname(gradlewFile))
) {
Expand Down Expand Up @@ -205,7 +206,8 @@ export async function updateArtifacts({
.join(' ')}`;

if (
config.isLockFileMaintenance === true ||
config.updateType === 'lockFileMaintenance' ||
kayw-geek marked this conversation as resolved.
Show resolved Hide resolved
config.isLockFileMaintenance ||
!updatedDeps.length ||
isGcvPropsFile(packageFileName)
) {
Expand Down
5 changes: 4 additions & 1 deletion lib/modules/manager/jsonnet-bundler/artifacts.ts
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,10 @@ export async function updateArtifacts(
};

try {
if (config.isLockFileMaintenance) {
if (
config.updateType === 'lockFileMaintenance' ||
config.isLockFileMaintenance
) {
await exec('jb update', execOptions);
} else {
const dependencyUrls = updatedDeps.map(dependencyUrl);
Expand Down
3 changes: 1 addition & 2 deletions lib/modules/manager/nix/artifacts.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ const dockerAdminConfig = {
process.env.CONTAINERBASE = 'true';

const config: UpdateArtifactsConfig = {};
const lockMaintenanceConfig = { ...config, isLockFileMaintenance: true };
const updateInputCmd = `nix \
--extra-experimental-features 'nix-command flakes' \
flake lock --update-input nixpkgs`;
Expand Down Expand Up @@ -294,7 +293,7 @@ describe('modules/manager/nix/artifacts', () => {
packageFileName: 'flake.nix',
updatedDeps: [{ depName: 'nixpkgs' }],
newPackageFileContent: '{}',
config: lockMaintenanceConfig,
config: { updateType: 'lockFileMaintenance', ...config },
});

expect(res).toEqual([
Expand Down
5 changes: 4 additions & 1 deletion lib/modules/manager/nix/artifacts.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@ export async function updateArtifacts({
}: UpdateArtifact): Promise<UpdateArtifactsResult[] | null> {
const lockFileName = packageFileName.replace(regEx(/\.nix$/), '.lock');
const existingLockFileContent = await readLocalFile(lockFileName, 'utf8');
const isLockFileMaintenance =
config.updateType === 'lockFileMaintenance' || config.isLockFileMaintenance;

if (!existingLockFileContent) {
logger.debug('No flake.lock found');
return null;
Expand All @@ -35,7 +38,7 @@ export async function updateArtifacts({
cmd += `--extra-access-tokens github.com=${token} `;
}

if (config.isLockFileMaintenance) {
if (isLockFileMaintenance) {
cmd += 'flake update';
} else {
const inputs = updatedDeps
Expand Down
2 changes: 1 addition & 1 deletion lib/modules/manager/nuget/artifacts.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ describe('modules/manager/nuget/artifacts', () => {
newPackageFileContent: '{}',
config: {
...config,
isLockFileMaintenance: true,
updateType: 'lockFileMaintenance',
},
}),
).toEqual([
Expand Down
6 changes: 5 additions & 1 deletion lib/modules/manager/nuget/artifacts.ts
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,11 @@ export async function updateArtifacts({
}

try {
if (updatedDeps.length === 0 && config.isLockFileMaintenance !== true) {
if (
updatedDeps.length === 0 &&
config.updateType !== 'lockFileMaintenance' &&
config.isLockFileMaintenance !== true
) {
logger.debug(
`Not updating lock file because no deps changed and no lock file maintenance.`,
);
Expand Down
5 changes: 4 additions & 1 deletion lib/modules/manager/pip-compile/artifacts.ts
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,10 @@ export async function updateArtifacts({
try {
await writeLocalFile(inputFileName, newInputContent);
// TODO(not7cd): use --upgrade option instead deleting
if (config.isLockFileMaintenance) {
if (
config.updateType === 'lockFileMaintenance' ||
config.isLockFileMaintenance
) {
await deleteLocalFile(outputFileName);
}
const compileArgs = extractHeaderCommand(existingOutput, outputFileName);
Expand Down
5 changes: 4 additions & 1 deletion lib/modules/manager/pipenv/artifacts.ts
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,10 @@ export async function updateArtifacts({
}
try {
await writeLocalFile(pipfileName, newPipfileContent);
if (config.isLockFileMaintenance) {
if (
config.updateType === 'lockFileMaintenance' ||
config.isLockFileMaintenance
) {
await deleteLocalFile(lockFileName);
}
const cmd = 'pipenv lock';
Expand Down
Loading