Skip to content
Permalink
Browse files

Merge branch 'develop' of github.com:gnosis/MultiSigWallet into featu…

…re/DEV-59-gas-modal
  • Loading branch information...
denisgranha committed Jan 24, 2018
2 parents fbc9b9d + 39b1755 commit 8ecc5711babe0df03437adbcece1dd14e0d20e54
Showing with 32 additions and 7 deletions.
  1. +3 −0 .gitignore
  2. +29 −7 .travis.yml
@@ -72,3 +72,6 @@ dapp/bower_components
# Keys
dapp/localhost.crt
dapp/localhost.key

# Travis
.travis/deploy_key
@@ -1,16 +1,38 @@
dist: trusty
language: node_js
node_js:
- "7"
- "8"
- "9"
- '7'
- '8'
- '9'
sudo: required
before_install:
- sudo apt-get update && sudo apt-get install -y libusb-1.0-0-dev
- export CHROME_BIN=chromium-browser
- export DISPLAY=:99.0
- sh -e /etc/init.d/xvfb start
- sudo apt-get update && sudo apt-get install -y libusb-1.0-0-dev
- export CHROME_BIN=chromium-browser
- export DISPLAY=:99.0
- sh -e /etc/init.d/xvfb start
install: npm install && cd dapp && npm install && cd ..
script:
- npm run test-dapp
- npm run test
before_deploy: "rm -rf dapp/node_modules"
deploy:
- provider: s3
bucket: wallet-development
secret_access_key:
secure: FfW1tvr/TMrFYeumFXymGTuz0NmqQvJypuV3BlpbsIcHKKdHb7s210zIHPsKyU2uRjJJGeQCMDzPuI6EHXc4p2cR1o2VPmI2JuXsPjd9SUWJYfxL3/kyhUk+kdyvR+wH8MycddWL0+1XOe8m4K9CERHAUJj3cO2YorrlVVyvaqsZOkNS2gDjBs7+vqUNRgI3CR9f80Tt/m2ib0oWKL9q2nia68F2gVdLyKq70gR1OuH3GAi+cswmdjQMt/twiNWVuRBCXyiFJu2z1vsEmK+GcNvSD6TOWPGJtsWtYmH5rOyzqDrcv/Ee2XeOmgcNKOHCqwR/BgbqMcpmimupuV2WFXUfbxwp+49d7wCW8S6QANnA2H/PS6wcTWwck9vCtOR8CYIWPoMA/711s2YZ+kwoBAVUlaBbTXYlMRVcSmT35PMXuLZ40ixOprPZYJZnt5nTArJiG8g7WTEfqtLUCNztLBiEQNnbc+pfj8h1ddN96kC5NWsyevE7LRsnmILlqrgupON/1E6//xcLZCIIy0PoF+1VAnXBTJHcuQr7ylqVVrm/l5BX+yKAmwD+42ybC0d2LMXQattsI4NLEyzsolsRdiHxLEe3BXO65azHLPZEoh+YeXuiaOXx4gWi8Q9Z1TzVUozRsBjYlOigIBLaFPncd0MM3xJaxjDGwqxw87eLQV8=
access_key_id:
secure: B3CEVnnj56OEqbbYdFOpG7lgkuhiZOr+1Iao/Jbsvqv6uAqDRU4mQY0WS+crJ8N3evQcJbW3F9CwAYH6IRy7k7Is4F/6nXr6eqlAz0ovNlSOKg8wxGg5bzI3Eg6meX3gy1nXSmvGNWyzBH4vPFwII8NpoqkVpeqUv7h16tXjDjw+UxeYyVICauzzbZOoVFAPLBj0E4IHMgtem1e4hWVvZnpO8x2sz8TNIDxiHxIakA9VqbHuWOuQ4uzoQm00FiuGY/iiGHG10UWScKIirWGtKwHPenPoB5F/KefuBOpJkJ8n7ir0uITbok1RASTw6hJevAKSqCBmIFdDR34AZtbT57Fw9JjC5Mhedeaz33xOz9Nu7bfUEH+JPq1MIYr88s1J1jaNJj4vFfPaYYjxXBA1CS9KzUo48VA4k+cX56h4sOkGCnGuTdTbL2UahyVjJy3mMcGI2Mq0xDipoyQSMM7Bhec21HcgE3gaFS2QAjbDVFQLonqpnaqshRGmXXCFBkP8kh0HhS3Ackq04wUR/1P7JpTTqslK9X9e9WcLQkNc+sGsFqaKETXBc5fZfDtZwvJOOeZnbOhO2mfDazHJJYKooMcTKTtWJhPSkjiqw6hcNUKE7gL/XSA9JraO6yYru/MCiBMNVVkWtbPBm83sLwTsd3EySLBp+XSP1JGD3FBV9Sw=
skip_cleanup: true
local_dir: dapp
on:
branch: develop
- provider: s3
bucket: wallet-staging
secret_access_key:
secure: FfW1tvr/TMrFYeumFXymGTuz0NmqQvJypuV3BlpbsIcHKKdHb7s210zIHPsKyU2uRjJJGeQCMDzPuI6EHXc4p2cR1o2VPmI2JuXsPjd9SUWJYfxL3/kyhUk+kdyvR+wH8MycddWL0+1XOe8m4K9CERHAUJj3cO2YorrlVVyvaqsZOkNS2gDjBs7+vqUNRgI3CR9f80Tt/m2ib0oWKL9q2nia68F2gVdLyKq70gR1OuH3GAi+cswmdjQMt/twiNWVuRBCXyiFJu2z1vsEmK+GcNvSD6TOWPGJtsWtYmH5rOyzqDrcv/Ee2XeOmgcNKOHCqwR/BgbqMcpmimupuV2WFXUfbxwp+49d7wCW8S6QANnA2H/PS6wcTWwck9vCtOR8CYIWPoMA/711s2YZ+kwoBAVUlaBbTXYlMRVcSmT35PMXuLZ40ixOprPZYJZnt5nTArJiG8g7WTEfqtLUCNztLBiEQNnbc+pfj8h1ddN96kC5NWsyevE7LRsnmILlqrgupON/1E6//xcLZCIIy0PoF+1VAnXBTJHcuQr7ylqVVrm/l5BX+yKAmwD+42ybC0d2LMXQattsI4NLEyzsolsRdiHxLEe3BXO65azHLPZEoh+YeXuiaOXx4gWi8Q9Z1TzVUozRsBjYlOigIBLaFPncd0MM3xJaxjDGwqxw87eLQV8=
access_key_id:
secure: B3CEVnnj56OEqbbYdFOpG7lgkuhiZOr+1Iao/Jbsvqv6uAqDRU4mQY0WS+crJ8N3evQcJbW3F9CwAYH6IRy7k7Is4F/6nXr6eqlAz0ovNlSOKg8wxGg5bzI3Eg6meX3gy1nXSmvGNWyzBH4vPFwII8NpoqkVpeqUv7h16tXjDjw+UxeYyVICauzzbZOoVFAPLBj0E4IHMgtem1e4hWVvZnpO8x2sz8TNIDxiHxIakA9VqbHuWOuQ4uzoQm00FiuGY/iiGHG10UWScKIirWGtKwHPenPoB5F/KefuBOpJkJ8n7ir0uITbok1RASTw6hJevAKSqCBmIFdDR34AZtbT57Fw9JjC5Mhedeaz33xOz9Nu7bfUEH+JPq1MIYr88s1J1jaNJj4vFfPaYYjxXBA1CS9KzUo48VA4k+cX56h4sOkGCnGuTdTbL2UahyVjJy3mMcGI2Mq0xDipoyQSMM7Bhec21HcgE3gaFS2QAjbDVFQLonqpnaqshRGmXXCFBkP8kh0HhS3Ackq04wUR/1P7JpTTqslK9X9e9WcLQkNc+sGsFqaKETXBc5fZfDtZwvJOOeZnbOhO2mfDazHJJYKooMcTKTtWJhPSkjiqw6hcNUKE7gL/XSA9JraO6yYru/MCiBMNVVkWtbPBm83sLwTsd3EySLBp+XSP1JGD3FBV9Sw=
skip_cleanup: true
local_dir: dapp
on:
branch: master

0 comments on commit 8ecc571

Please sign in to comment.
You can’t perform that action at this time.