Skip to content

Commit

Permalink
fix(install): Use npm-is to require Yarn before install. Fixes PWA-50…
Browse files Browse the repository at this point in the history
…5. (#2384)

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

* Handle CI build failure

* fix: do not check in CI

* Revert docker commit and update typo

* Handle docker uid/gid switch issue

* set CI env variable in dockerfile

Co-authored-by: Devagouda <40405790+dpatil-magento@users.noreply.github.com>
Co-authored-by: Dev Patil <depatil@adobe.com>
  • Loading branch information
3 people authored May 7, 2020
1 parent 76cf84b commit 9ad21c9
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 0 deletions.
3 changes: 3 additions & 0 deletions dev.dockerfile
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
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
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 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

0 comments on commit 9ad21c9

Please # to comment.