Skip to content
Snippets Groups Projects
Unverified Commit 28779c6a authored by Bob van de Vijver's avatar Bob van de Vijver Committed by GitHub
Browse files

refactor(composer): use update for lock file maintenance (#12185)

parent 5434a9d1
No related branches found
No related tags found
No related merge requests found
...@@ -73,7 +73,7 @@ Array [ ...@@ -73,7 +73,7 @@ Array [
exports[`manager/composer/artifacts performs lockFileMaintenance 1`] = ` exports[`manager/composer/artifacts performs lockFileMaintenance 1`] = `
Array [ Array [
Object { Object {
"cmd": "composer install --ignore-platform-reqs --no-ansi --no-interaction --no-scripts --no-autoloader --no-plugins", "cmd": "composer update --ignore-platform-reqs --no-ansi --no-interaction --no-scripts --no-autoloader --no-plugins",
"options": Object { "options": Object {
"cwd": "/tmp/github/some/repo", "cwd": "/tmp/github/some/repo",
"encoding": "utf-8", "encoding": "utf-8",
......
...@@ -10,7 +10,6 @@ import * as datasourcePackagist from '../../datasource/packagist'; ...@@ -10,7 +10,6 @@ import * as datasourcePackagist from '../../datasource/packagist';
import { logger } from '../../logger'; import { logger } from '../../logger';
import { ExecOptions, exec } from '../../util/exec'; import { ExecOptions, exec } from '../../util/exec';
import { import {
deleteLocalFile,
ensureCacheDir, ensureCacheDir,
ensureLocalDir, ensureLocalDir,
getSiblingFileName, getSiblingFileName,
...@@ -102,10 +101,6 @@ export async function updateArtifacts({ ...@@ -102,10 +101,6 @@ export async function updateArtifacts({
...config.constraints, ...config.constraints,
}; };
if (config.isLockFileMaintenance) {
await deleteLocalFile(lockFileName);
}
const preCommands: string[] = [ const preCommands: string[] = [
`install-tool composer ${await getComposerConstraint(constraints)}`, `install-tool composer ${await getComposerConstraint(constraints)}`,
]; ];
...@@ -126,7 +121,7 @@ export async function updateArtifacts({ ...@@ -126,7 +121,7 @@ export async function updateArtifacts({
const cmd = 'composer'; const cmd = 'composer';
let args: string; let args: string;
if (config.isLockFileMaintenance) { if (config.isLockFileMaintenance) {
args = 'install'; args = 'update';
} else { } else {
args = args =
( (
...@@ -166,7 +161,7 @@ export async function updateArtifacts({ ...@@ -166,7 +161,7 @@ export async function updateArtifacts({
return res; return res;
} }
logger.debug(`Commiting vendor files in ${vendorDir}`); logger.debug(`Committing vendor files in ${vendorDir}`);
for (const f of [...status.modified, ...status.not_added]) { for (const f of [...status.modified, ...status.not_added]) {
if (f.startsWith(vendorDir)) { if (f.startsWith(vendorDir)) {
res.push({ res.push({
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment