Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

fix(install): Use npm-is to require Yarn before install. Fixes PWA-505. #2384

Merged
merged 10 commits into from
May 7, 2020
Merged

fix(install): Use npm-is to require Yarn before install. Fixes PWA-505. #2384

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
12cde63
fix(install): Use npm-is to require Yarn before install. Fixes PWA-505.
May 6, 2020
9b5ca20
Merge branch 'develop' into zetlen/require-yarn-at-preinstall
dpatil-magento May 6, 2020
1d9dafd
Merge branch 'develop' into zetlen/require-yarn-at-preinstall
dpatil-magento May 6, 2020
d522242
Handle CI build failure
dpatil-magento May 6, 2020
bb5c127
Merge branch 'develop' into zetlen/require-yarn-at-preinstall
dpatil-magento May 7, 2020
31247ba
fix: do not check in CI
May 7, 2020
d0801cb
Revert docker commit and update typo
dpatil-magento May 7, 2020
9e5339b
Handle docker uid/gid switch issue
dpatil-magento May 7, 2020
7690674
set CI env variable in dockerfile
dpatil-magento May 7, 2020
d48497f
Merge branch 'develop' into zetlen/require-yarn-at-preinstall
dpatil-magento May 7, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions dev.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@ RUN apk --no-cache --virtual add \
g++ \
yarn

# set env variable for CI
ENV CI=true

# copy just the dependency files and configs needed for install
COPY packages/create-pwa/package.json ./packages/create-pwa/package.json
COPY packages/babel-preset-peregrine/package.json ./packages/babel-preset-peregrine/package.json
Expand Down
1 change: 1 addition & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
"danger": "danger-ci",
"lint": "eslint '@(packages|scripts)/**/{*.js,package.json}' --ignore-pattern node_modules --ignore-pattern storybook-dist",
"postbuild": "rimraf \"./packages/*/dist/{,**/}__*__\"",
"preinstall": "node -e 'process.env.CI||process.exit(1)' || npx npm-is yarn",
"prepare": "node scripts/monorepo-introduction.js",
"prettier": "prettier --loglevel warn --write '@(packages|scripts)/**/*.@(css|graphql|js)' '*.js'",
"prettier:check": "prettier --list-different '@(packages|scripts)/**/*.@(css|graphql|js)' '*.js'",
Expand Down
3 changes: 3 additions & 0 deletions prod.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@ RUN apk --no-cache --virtual add \
g++ \
yarn

# set env variable for CI
ENV CI=true

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

AWS has CI env variable but dockerfile needs to have also.

# copy just the dependency files and configs needed for install
COPY packages/create-pwa/package.json ./packages/create-pwa/package.json
COPY packages/babel-preset-peregrine/package.json ./packages/babel-preset-peregrine/package.json
Expand Down