renovate/renovate
1
0
Fork 0
mirror of https://github.com/renovatebot/renovate.git synced 2025-01-12 15:06:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

feat(cargo): Use --workspace for crate updating (#12334)

Browse source
This commit is contained in:
Amos Wenger 2021-10-27 12:03:32 +02:00 committed by GitHub
parent 6baa01f22d
commit 9030b1a9ed
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
lib/manager/cargo/__snapshots__/artifacts.spec.ts.snap
View file

@ -3,7 +3,7 @@
exports[`manager/cargo/artifacts returns null if unchanged 1`] = `
Array [
Object {
"cmd": "cargo update --manifest-path Cargo.toml --package dep1",
"cmd": "cargo update --manifest-path Cargo.toml --workspace",
"options": Object {
"cwd": "/tmp/github/some/repo",
"encoding": "utf-8",
@ -26,7 +26,7 @@ Array [
exports[`manager/cargo/artifacts returns updated Cargo.lock 1`] = `
Array [
Object {
"cmd": "cargo update --manifest-path Cargo.toml --package dep1",
"cmd": "cargo update --manifest-path Cargo.toml --workspace",
"options": Object {
"cwd": "/tmp/github/some/repo",
"encoding": "utf-8",
@ -84,7 +84,7 @@ Array [
},
},
Object {
"cmd": "docker run --rm --name=renovate_rust --label=renovate_child -v \\"/tmp/github/some/repo\\":\\"/tmp/github/some/repo\\" -w \\"/tmp/github/some/repo\\" renovate/rust bash -l -c \\"cargo update --manifest-path Cargo.toml --package dep1\\"",
"cmd": "docker run --rm --name=renovate_rust --label=renovate_child -v \\"/tmp/github/some/repo\\":\\"/tmp/github/some/repo\\" -w \\"/tmp/github/some/repo\\" renovate/rust bash -l -c \\"cargo update --manifest-path Cargo.toml --workspace\\"",
"options": Object {
"cwd": "/tmp/github/some/repo",
"encoding": "utf-8",
@ -107,7 +107,7 @@ Array [
exports[`manager/cargo/artifacts returns updated workspace Cargo.lock 1`] = `
Array [
Object {
"cmd": "cargo update --manifest-path crates/one/Cargo.toml --package dep1",
"cmd": "cargo update --manifest-path crates/one/Cargo.toml --workspace",
"options": Object {
"cwd": "/tmp/github/some/repo",
"encoding": "utf-8",
@ -130,7 +130,7 @@ Array [
exports[`manager/cargo/artifacts updates Cargo.lock based on the lookupName, when given 1`] = `
Array [
Object {
"cmd": "cargo update --manifest-path Cargo.toml --package dep1",
"cmd": "cargo update --manifest-path Cargo.toml --workspace",
"options": Object {
"cwd": "/tmp/github/some/repo",
"encoding": "utf-8",

40
lib/manager/cargo/artifacts.ts
View file

@ -7,16 +7,17 @@ import {
readLocalFile,
writeLocalFile,
} from '../../util/fs';
import { regEx } from '../../util/regex';
import type { UpdateArtifact, UpdateArtifactsResult } from '../types';
async function cargoUpdate(
manifestPath: string,
packageName?: string
isLockFileMaintenance: boolean
): Promise<void> {
let cmd = `cargo update --manifest-path ${quote(manifestPath)}`;
if (packageName) {
cmd += ` --package ${quote(packageName)}`;
// If we're updating a specific crate, `cargo-update` requires `--workspace`
// for more information, see: https://github.com/renovatebot/renovate/issues/12332
if (!isLockFileMaintenance) {
cmd += ` --workspace`;
}
const execOptions: ExecOptions = {
@ -24,28 +25,7 @@ async function cargoUpdate(
image: 'rust',
},
};
try {
await exec(cmd, execOptions);
} catch (err) /* istanbul ignore next */ {
// Two different versions of one dependency can be present in the same
// crate, and when that happens an attempt to update it with --package ${dep}
// key results in cargo exiting with error code `101` and an error message:
// "error: There are multiple `${dep}` packages in your project".
//
// If exception `err` was caused by this, we execute `updateAll` function
// instead of returning an error. `updateAll` function just executes
// "cargo update --manifest-path ${localPackageFileName}" without the `--package` key.
//
// If exception `err` was not caused by this, we just rethrow it. It will be caught
// by the outer try { } catch {} and processed normally.
const msgStart = 'error: There are multiple';
if (err.code === 101 && err.stderr.startsWith(msgStart)) {
cmd = cmd.replace(regEx(/ --package.*/), '');
await exec(cmd, execOptions);
} else {
throw err; // this is caught below
}
}
}
export async function updateArtifacts({
@ -83,15 +63,7 @@ export async function updateArtifacts({
try {
await writeLocalFile(packageFileName, newPackageFileContent);
logger.debug('Updating ' + lockFileName);
for (let i = 0; i < updatedDeps.length; i += 1) {
const dep = updatedDeps[i];
// Update dependency `${dep}` in Cargo.lock file corresponding to Cargo.toml file located
// at ${localPackageFileName} path
await cargoUpdate(packageFileName, dep.lookupName ?? dep.depName);
}
if (isLockFileMaintenance) {
await cargoUpdate(packageFileName);
}
await cargoUpdate(packageFileName, isLockFileMaintenance);
logger.debug('Returning updated Cargo.lock');
const newCargoLockContent = await readLocalFile(lockFileName);
if (existingLockFileContent === newCargoLockContent) {