Skip to content

/electron

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

build: ensure consistent lock files across multiple machines #17955

Merged
merged 5 commits into from Apr 30, 2019
+9,970 −15,506

Conversation

Reviewers

@jkleinsc jkleinsc

@codebytere codebytere

Assignees
No one assigned
Labels
in-flight/6-0-x needs-manual-bp/6-0-x
Projects
None yet
Milestone
No milestone
4 participants
@MarshallOfSound @nornagon @jkleinsc @codebytere
@MarshallOfSound
Copy link
Member

commented Apr 24, 2019 •
edited

Uses npx yarn instead of npm to fix inconsistent lock files

Notes: no-notes

@MarshallOfSound MarshallOfSound added the target/6-0-x label Apr 26, 2019

@nornagon

This comment has been minimized.

Sign in to view
Copy link
Contributor

commented Apr 26, 2019

tests failing? with

../src/main.cc:1:10: fatal error: js_native_api.h: No such file or directory

@MarshallOfSound MarshallOfSound referenced this pull request Apr 29, 2019

Closed

build: use npm ci instead of npm install to ensure no lock file changes #17347

@MarshallOfSound MarshallOfSound force-pushed the npx branch from 8253d27 to 565b401 Apr 29, 2019

@MarshallOfSound MarshallOfSound changed the title build: ensure consistent package-lock across multiple machines build: ensure consistent lock files across multiple machines Apr 29, 2019

@MarshallOfSound

This comment has been minimized.

Sign in to view
Copy link
Member Author

commented Apr 29, 2019

This is the commit that does the npm->yarn conversion.

f00066f
@MarshallOfSound

This comment has been minimized.

Sign in to view
Copy link
Member Author

commented Apr 29, 2019

As an added bonus --frozen-lockfile will cause CI to fail if the package.json doesn't match the current lock file.
@MarshallOfSound
chore: replace last instance of `npm install`
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
Loading status checks…
4a66f49
@codebytere

codebytere approved these changes Apr 30, 2019
View changes

Copy link
Member

left a comment

i wish we didn’t need to use yarn but given mitigating circumstances
i think it’s unfortunately what we must do
@jkleinsc

jkleinsc approved these changes Apr 30, 2019
View changes

@MarshallOfSound MarshallOfSound merged commit 98c51dd into master Apr 30, 2019
5 of 6 checks passed

5 of 6 checks passed

appveyor: win-ia32-testing AppVeyor build failed
Details
Semantic Pull Request ready to be squashed
Details
appveyor: win-ia32-testing-pr AppVeyor build succeeded
Details
appveyor: win-x64-testing AppVeyor build succeeded
Details
appveyor: win-x64-testing-pr AppVeyor build succeeded
Details
release-notes Release notes found
@release-clerk

This comment has been minimized.

Sign in to view
Copy link

commented Apr 30, 2019

No Release Notes

@MarshallOfSound MarshallOfSound deleted the npx branch Apr 30, 2019

@trop

This comment has been minimized.

Sign in to view
Copy link
Contributor

commented Apr 30, 2019

I was unable to backport this PR to "6-0-x" cleanly;
you will need to perform this backport manually.

@trop trop bot added needs-manual-bp/6-0-x and removed target/6-0-x labels Apr 30, 2019

MarshallOfSound added a commit that referenced this pull request Apr 30, 2019

@MarshallOfSound
build: ensure consistent lock files across multiple machines (#17955) 
* build: ensure consistent package-lock across multiple machines

* build: fix linting errors and use npm ci instead of npm install

* build: use a yarn.lock and yarn instead of package-lock and npm

* chore: replace package-lock.json files with yarn.lock

* chore: replace last instance of `npm install`
Loading status checks…
bca9a89

@MarshallOfSound MarshallOfSound referenced this pull request Apr 30, 2019

Merged

build: ensure consistent lock files across multiple machines (#17955) #18071

@trop

This comment has been minimized.

Sign in to view
Copy link
Contributor

commented Apr 30, 2019

A maintainer has manually backported this PR to "6-0-x", please check out #18071

@trop trop bot added the in-flight/6-0-x label Apr 30, 2019

MarshallOfSound added a commit that referenced this pull request Apr 30, 2019

@MarshallOfSound
build: ensure consistent lock files across multiple machines (#17955) 
* build: ensure consistent package-lock across multiple machines

* build: fix linting errors and use npm ci instead of npm install

* build: use a yarn.lock and yarn instead of package-lock and npm

* chore: replace package-lock.json files with yarn.lock

* chore: replace last instance of `npm install`
Loading status checks…
bc400a0

MarshallOfSound added a commit that referenced this pull request Apr 30, 2019

@MarshallOfSound
build: ensure consistent lock files across multiple machines (#17955) 
* build: ensure consistent package-lock across multiple machines

* build: fix linting errors and use npm ci instead of npm install

* build: use a yarn.lock and yarn instead of package-lock and npm

* chore: replace package-lock.json files with yarn.lock

* chore: replace last instance of `npm install`
Loading status checks…
167ecd8

MarshallOfSound added a commit that referenced this pull request May 1, 2019

@MarshallOfSound
build: ensure consistent lock files across multiple machines (#17955) (… 
…#18071)

* build: ensure consistent package-lock across multiple machines

* build: fix linting errors and use npm ci instead of npm install

* build: use a yarn.lock and yarn instead of package-lock and npm

* chore: replace package-lock.json files with yarn.lock

* chore: replace last instance of `npm install`
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
Loading status checks…
57f7c8b
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.