Merge pull request #917 from ethereum/remixRef

Pull remix (dont use npm version)
pull/1/head
yann300 7 years ago committed by GitHub
commit 1801ff336e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 1
      .gitignore
  2. 2
      .travis.yml
  3. 3
      package.json

1
.gitignore vendored

@ -6,3 +6,4 @@ soljson.js
npm-debug.log*
babelify-src
package-lock.json
remix

@ -2,7 +2,7 @@ language: node_js
node_js:
- "7"
script:
- npm run lint && npm run test && npm run downloadsolc && npm run make-mock-compiler && npm run build
- npm run lint && npm run test && npm run downloadsolc && npm run make-mock-compiler && npm run pullremix && npm run linkremix && npm run build
- ./ci/browser_tests.sh
deploy:
- provider: script

@ -19,6 +19,7 @@
"csjs-inject": "^1.0.1",
"csslint": "^1.0.2",
"deep-equal": "^1.0.1",
"npm-link-local": "^1.1.0",
"remix-core": "latest",
"remix-lib": "latest",
"remix-solidity": "latest",
@ -136,6 +137,8 @@
]
},
"scripts": {
"pullremix": "mkdir remix; git clone https://github.com/ethereum/remix; cd ..",
"linkremix": "npm-link-local ./remix/remix-lib && npm-link-local ./remix/remix-core && npm-link-local ./remix/remix-solidity && npm-link-local ./remix/remix-debugger",
"build": "browserify src/index.js -o build/app.js",
"browsertest": "sleep 5 && npm run nightwatch_local",
"csslint": "csslint --ignore=order-alphabetical --errors='errors,duplicate-properties,empty-rules' --exclude-list='assets/css/font-awesome.min.css' assets/css/",

Loading…
Cancel
Save