diff options
| author |  Vijay A <avijayr@protonmail.com> | 2021-05-18 05:16:25 +0530 |
|---|---|---|
| committer | Vijay A <avijayr@protonmail.com> | 2021-05-18 05:30:14 +0530 |
| commit | 2aefc2b40dfd2aa109e386f9f8e293ac7321f5c5 (patch) | |
| tree | ac7206e6208c04c64c70e20fca03c3dcd9371d5e | |
| parent | Reverting gDrive link in README (might cause a security issue). [skip ci] (diff) | |
| download | ferdium-app-2aefc2b40dfd2aa109e386f9f8e293ac7321f5c5.tar.gz ferdium-app-2aefc2b40dfd2aa109e386f9f8e293ac7321f5c5.tar.zst ferdium-app-2aefc2b40dfd2aa109e386f9f8e293ac7321f5c5.zip | |
Removed uninstall of 'node-sass' from nightly travis build - since it was causing incorrect commit into branch
Updated Dockerfile for the same cmd
| -rw-r--r-- | .travis.yml | 4 | ||||
| -rw-r--r-- | Dockerfile | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml index 2495cb229..e8183dd9d 100644 --- a/.travis.yml +++ b/.travis.yml | |||
| @@ -58,8 +58,8 @@ before_install: | |||
| 58 | fi | 58 | fi |
| 59 | install: | 59 | install: |
| 60 | - npm cache clean -f || travis_terminate 1 | 60 | - npm cache clean -f || travis_terminate 1 |
| 61 | - travis_retry npm uninstall node-gyp node-sass || travis_terminate 1 | 61 | - travis_retry npm uninstall node-gyp || travis_terminate 1 |
| 62 | - travis_retry npm i -g node-gyp@8.0.0 node-sass@5.0.0 || travis_terminate 1 | 62 | - travis_retry npm i -g node-gyp@8.0.0 || travis_terminate 1 |
| 63 | - cd recipes && npm i && npm run package && cd .. || travis_terminate 1 | 63 | - cd recipes && npm i && npm run package && cd .. || travis_terminate 1 |
| 64 | - travis_retry npx lerna bootstrap || travis_terminate 1 | 64 | - travis_retry npx lerna bootstrap || travis_terminate 1 |
| 65 | before_script: | 65 | before_script: |
diff --git a/Dockerfile b/Dockerfile index 881332c19..7c25776e4 100644 --- a/Dockerfile +++ b/Dockerfile | |||
| @@ -14,7 +14,7 @@ COPY lerna.json ./ | |||
| 14 | # Note: This is being set to bypass the error with missing git repo information for the 'preval-build-info' module | 14 | # Note: This is being set to bypass the error with missing git repo information for the 'preval-build-info' module |
| 15 | ENV PREVAL_BUILD_INFO_PLACEHOLDERS=true | 15 | ENV PREVAL_BUILD_INFO_PLACEHOLDERS=true |
| 16 | 16 | ||
| 17 | RUN npm i node-gyp@8.0.0 node-sass@5.0.0 \ | 17 | RUN npm i node-gyp@8.0.0 \ |
| 18 | && npx lerna bootstrap | 18 | && npx lerna bootstrap |
| 19 | 19 | ||
| 20 | COPY . . | 20 | COPY . . |