diff --git a/lib/manager/npm/post-update/__snapshots__/yarn.spec.ts.snap b/lib/manager/npm/post-update/__snapshots__/yarn.spec.ts.snap index 14d68a3c71a900fcc4c5084116fae2389fa84aeb..5351e93ad0117dd1adc44da722c36cdf8aae5f76 100644 --- a/lib/manager/npm/post-update/__snapshots__/yarn.spec.ts.snap +++ b/lib/manager/npm/post-update/__snapshots__/yarn.spec.ts.snap @@ -115,7 +115,7 @@ Array [ exports[`manager/npm/post-update/yarn generates lock files using yarn v2.1.0 1`] = ` Array [ Object { - "cmd": "yarn install --ignore-engines --ignore-platform --network-timeout 100000", + "cmd": "yarn install", "options": Object { "cwd": "some-dir", "encoding": "utf-8", @@ -128,6 +128,7 @@ Array [ "NO_PROXY": "localhost", "PATH": "/tmp/path", "YARN_ENABLE_SCRIPTS": "0", + "YARN_HTTP_TIMEOUT": "100000", }, "timeout": 900000, }, @@ -228,7 +229,7 @@ Array [ exports[`manager/npm/post-update/yarn performs lock file maintenance using yarn v2.1.0 1`] = ` Array [ Object { - "cmd": "yarn install --ignore-engines --ignore-platform --network-timeout 100000", + "cmd": "yarn install", "options": Object { "cwd": "some-dir", "encoding": "utf-8", @@ -241,6 +242,7 @@ Array [ "NO_PROXY": "localhost", "PATH": "/tmp/path", "YARN_ENABLE_SCRIPTS": "0", + "YARN_HTTP_TIMEOUT": "100000", }, "timeout": 900000, }, diff --git a/lib/manager/npm/post-update/yarn.ts b/lib/manager/npm/post-update/yarn.ts index f6a414d84f9df2ee4658d05da494d76d0a3cc1c6..53e243f634dce2f51f271b535950ef6c15972c53 100644 --- a/lib/manager/npm/post-update/yarn.ts +++ b/lib/manager/npm/post-update/yarn.ts @@ -74,8 +74,13 @@ export async function generateLockFile( preCommands.push(optimizeCommand); } const commands = []; - let cmdOptions = - '--ignore-engines --ignore-platform --network-timeout 100000'; + let cmdOptions = ''; + if (isYarn1) { + cmdOptions += + '--ignore-engines --ignore-platform --network-timeout 100000'; + } else { + extraEnv.YARN_HTTP_TIMEOUT = '100000'; + } if (global.trustLevel !== 'high' || config.ignoreScripts) { if (isYarn1) { cmdOptions += ' --ignore-scripts';