-
Notifications
You must be signed in to change notification settings - Fork 324
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge 'master' into feat/brave-build-with-chrome-sockets
- Loading branch information
Showing
55 changed files
with
2,717 additions
and
1,972 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,3 +2,6 @@ vendor | |
| build | ||
| coverage/ | ||
| node_modules | ||
| add-on/dist | ||
| firefox | ||
| package-lock.json | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,45 +1,25 @@ | ||
| language: node_js | ||
| node_js: | ||
| - "lts/*" | ||
| sudo: false | ||
| env: | ||
| global: | ||
| - secure: "LUZnP+lhVj0zbFe/tSppMvI6jaXyOos84WZehPImMeara9/RRrRk5QpKsUsqr1x/oHzElJnbAX9OD/GOuEI4fyYv9qBXr8CKxBpmjlM2ElY85WcGm9mntRXtvR0iscR3Jg9kPtUBqzVlh1E/mQjs5GR2nLn0Fe34Xwl6TWd3m6c=" | ||
| - DISPLAY=':99.0' | ||
| - FIREFOX_BINARY='./firefox/firefox' | ||
| - PATH="./firefox/:${PATH}" | ||
| - CXX=g++-4.8 | ||
| # matrix: | ||
| # - FIREFOX_RELEASE='latest' | ||
| # - FIREFOX_RELEASE='nightly-latest' | ||
| # - FIREFOX_RELEASE='52.0' | ||
| # - FIREFOX_RELEASE='esr-latest' | ||
|
|
||
| # pulled in by node-webcrypto-ossl@1.0.7 | ||
| addons: | ||
| apt: | ||
| sources: | ||
| - ubuntu-toolchain-r-test | ||
| packages: | ||
| - g++-4.8 | ||
|
|
||
| - 10.15.1 | ||
| matrix: | ||
| fast_finish: true | ||
| # allow_failures: | ||
| # - env: FIREFOX_RELEASE='nightly-latest' | ||
| # - env: FIREFOX_RELEASE='esr-latest' | ||
| allow_failures: | ||
| - os: windows | ||
| cache: | ||
| directories: | ||
| - node_modules | ||
| #before_script: | ||
| # - test $FIREFOX_RELEASE != nightly-latest || wget -O firefox-$FIREFOX_RELEASE.tar.bz2 "https://download.mozilla.org/?product=firefox-$FIREFOX_RELEASE&os=linux64&lang=en-US" | ||
| # - test $FIREFOX_RELEASE != latest || wget -O firefox-$FIREFOX_RELEASE.tar.bz2 "https://download.mozilla.org/?product=firefox-$FIREFOX_RELEASE&os=linux64&lang=en-US" | ||
| # - test $FIREFOX_RELEASE != '55.0' || wget -O firefox-$FIREFOX_RELEASE.tar.bz2 "https://download.mozilla.org/?product=firefox-$FIREFOX_RELEASE&os=linux64&lang=en-US" | ||
| # - test $FIREFOX_RELEASE != esr-latest || wget -O firefox-$FIREFOX_RELEASE.tar.bz2 "https://download.mozilla.org/?product=firefox-$FIREFOX_RELEASE&os=linux64&lang=en-US" | ||
| # - tar xvf firefox-$FIREFOX_RELEASE.tar.bz2 | ||
| # - sh -e /etc/init.d/xvfb start | ||
| - npm | ||
| - yarn | ||
| os: | ||
| - linux | ||
| - osx | ||
| - windows | ||
| addons: | ||
| homebrew: | ||
| packages: jq | ||
| install: | ||
| - npm run yarn-build | ||
| - npm run ci:install | ||
| script: | ||
| - npm test | ||
| - npm run lint | ||
| - npm run ci:build | ||
| - npm run ci:test | ||
| - npm run ci:lint | ||
| after_success: npx nyc report --reporter=text-lcov > coverage.lcov && npx codecov | ||
| notifications: | ||
| email: false |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,9 +1,24 @@ | ||
| FROM node:10.11.0 | ||
| RUN mkdir -p /usr/src/app | ||
| WORKDIR /usr/src/app | ||
| ENV PATH="/usr/src/app/node_modules/.bin:${PATH}" | ||
| FROM node:10.15.1 | ||
|
|
||
| ARG USER_ID | ||
| ARG GROUP_ID | ||
|
|
||
| RUN curl -s https://ipfs.io/ipfs/QmbukYcmtyU6ZEKt6fepnvrTNa9F6VqsUPMUgNxQjEmphH > /usr/local/bin/jq && chmod +x /usr/local/bin/jq | ||
| COPY package.json /usr/src/app/package.json | ||
| COPY yarn.lock /usr/src/app/yarn.lock | ||
|
|
||
| RUN mkdir -p /home/node/app | ||
| WORKDIR /home/node/app | ||
|
|
||
| COPY . /home/node/app | ||
|
|
||
| RUN if [ ${USER_ID:-0} -ne 0 ] && [ ${GROUP_ID:-0} -ne 0 ]; then \ | ||
| userdel -f node && \ | ||
| if getent group node ; then groupdel node; fi && \ | ||
| groupadd -g ${GROUP_ID} node && \ | ||
| useradd -l -u ${USER_ID} -g node node && \ | ||
| chown -fhR ${USER_ID}:${GROUP_ID} /home/node; fi | ||
|
|
||
| USER node | ||
|
|
||
| RUN npm run ci:install | ||
| COPY . /usr/src/app | ||
|
|
||
| ENV PATH="/home/node/app/node_modules/.bin:${PATH}" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.