Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
renovate
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
SmartDataLab
public
applications
renovate
Commits
04289fb1
Commit
04289fb1
authored
Jun 3, 2020
by
Rhys Arkins
Browse files
Options
Downloads
Patches
Plain Diff
fix(yarn): always ignore engines and platform
parent
8a7d0c23
No related branches found
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
lib/manager/npm/post-update/__snapshots__/yarn.spec.ts.snap
+8
-8
8 additions, 8 deletions
lib/manager/npm/post-update/__snapshots__/yarn.spec.ts.snap
lib/manager/npm/post-update/yarn.ts
+3
-2
3 additions, 2 deletions
lib/manager/npm/post-update/yarn.ts
with
11 additions
and
10 deletions
lib/manager/npm/post-update/__snapshots__/yarn.spec.ts.snap
+
8
−
8
View file @
04289fb1
...
...
@@ -3,7 +3,7 @@
exports[`manager/npm/post-update/yarn catches errors 1`] = `
Array [
Object {
"cmd": "yarn install --network-timeout 100000 --ignore-scripts
--ignore-engines --ignore-platform
",
"cmd": "yarn install
--ignore-engines --ignore-platform
--network-timeout 100000 --ignore-scripts",
"options": Object {
"cwd": "some-dir",
"encoding": "utf-8",
...
...
@@ -25,7 +25,7 @@ Array [
exports[`manager/npm/post-update/yarn generates lock files using yarn v1.22.0 1`] = `
Array [
Object {
"cmd": "yarn install --network-timeout 100000 --ignore-scripts
--ignore-engines --ignore-platform
",
"cmd": "yarn install
--ignore-engines --ignore-platform
--network-timeout 100000 --ignore-scripts",
"options": Object {
"cwd": "some-dir",
"encoding": "utf-8",
...
...
@@ -59,7 +59,7 @@ Array [
},
},
Object {
"cmd": "yarn install --network-timeout 100000 --ignore-scripts
--ignore-engines --ignore-platform
",
"cmd": "yarn install
--ignore-engines --ignore-platform
--network-timeout 100000 --ignore-scripts",
"options": Object {
"cwd": "some-dir",
"encoding": "utf-8",
...
...
@@ -93,7 +93,7 @@ Array [
},
},
Object {
"cmd": "yarn install --network-timeout 100000 --ignore-scripts
--ignore-engines --ignore-platform
",
"cmd": "yarn install
--ignore-engines --ignore-platform
--network-timeout 100000 --ignore-scripts",
"options": Object {
"cwd": "some-dir",
"encoding": "utf-8",
...
...
@@ -115,7 +115,7 @@ Array [
exports[`manager/npm/post-update/yarn performs lock file updates and full install using yarn v1.22.0 1`] = `
Array [
Object {
"cmd": "yarn install --network-timeout 100000 --ignore-scripts
--ignore-engines --ignore-platform
",
"cmd": "yarn install
--ignore-engines --ignore-platform
--network-timeout 100000 --ignore-scripts",
"options": Object {
"cwd": "some-dir",
"encoding": "utf-8",
...
...
@@ -132,7 +132,7 @@ Array [
},
},
Object {
"cmd": "yarn upgrade some-dep --network-timeout 100000 --ignore-scripts
--ignore-engines --ignore-platform
",
"cmd": "yarn upgrade some-dep
--ignore-engines --ignore-platform
--network-timeout 100000 --ignore-scripts",
"options": Object {
"cwd": "some-dir",
"encoding": "utf-8",
...
...
@@ -154,7 +154,7 @@ Array [
exports[`manager/npm/post-update/yarn performs lock file updates using yarn v1.22.0 1`] = `
Array [
Object {
"cmd": "yarn install --network-timeout 100000 --ignore-scripts
--ignore-engines --ignore-platform
",
"cmd": "yarn install
--ignore-engines --ignore-platform
--network-timeout 100000 --ignore-scripts",
"options": Object {
"cwd": "some-dir",
"encoding": "utf-8",
...
...
@@ -171,7 +171,7 @@ Array [
},
},
Object {
"cmd": "yarn upgrade some-dep --network-timeout 100000 --ignore-scripts
--ignore-engines --ignore-platform
",
"cmd": "yarn upgrade some-dep
--ignore-engines --ignore-platform
--network-timeout 100000 --ignore-scripts",
"options": Object {
"cwd": "some-dir",
"encoding": "utf-8",
...
...
This diff is collapsed.
Click to expand it.
lib/manager/npm/post-update/yarn.ts
+
3
−
2
View file @
04289fb1
...
...
@@ -53,9 +53,10 @@ export async function generateLockFile(
preCommands
.
push
(
optimizeCommand
);
}
const
commands
=
[];
let
cmdOptions
=
'
--network-timeout 100000
'
;
let
cmdOptions
=
'
--ignore-engines --ignore-platform --network-timeout 100000
'
;
if
(
global
.
trustLevel
!==
'
high
'
||
config
.
ignoreScripts
)
{
cmdOptions
+=
'
--ignore-scripts
--ignore-engines --ignore-platform
'
;
cmdOptions
+=
'
--ignore-scripts
'
;
}
const
tagConstraint
=
await
getNodeConstraint
(
config
);
const
execOptions
:
ExecOptions
=
{
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment