From 6e50ac9dddbf7e4a65882183c365d3dda11f3c86 Mon Sep 17 00:00:00 2001 From: Ahmed Ali Date: Fri, 12 Jun 2020 13:36:02 +0200 Subject: [PATCH 1/4] init travis --- .travis.yml | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 00000000..182074e3 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,26 @@ +dist: xenial +sudo: required +language: node_js +node_js: + - '12' + +services: + - docker + +cache: npm + +matrix: + fast_finish: true + +before_install: + - npm install -g npm + - npm install -g ganache-cli@~6.5.1 + +before_script: + - ganache-cli --port 18545 > ganache-cli.log & + +script: + - npm run lint + +notifications: + email: false \ No newline at end of file From 34290c831f5edaefc98d3d4f5af86344c4b3c6ee Mon Sep 17 00:00:00 2001 From: Ahmed Ali Date: Fri, 12 Jun 2020 13:52:10 +0200 Subject: [PATCH 2/4] fix build:metadata --- .travis.yml | 1 + README.md | 1 + 2 files changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 182074e3..e60cef54 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,6 +21,7 @@ before_script: script: - npm run lint + - npm run build:metadata notifications: email: false \ No newline at end of file diff --git a/README.md b/README.md index 58a6564d..8239ee1b 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,6 @@ [![banner](https://raw.githubusercontent.com/oceanprotocol/art/master/github/repo-banner%402x.png)](https://oceanprotocol.com) +|[![Build Status](https://travis-ci.com/oceanprotocol/lib-js.svg?token=soMi2nNfCZq19zS1Rx4i&branch=develop)](https://travis-ci.com/oceanprotocol/lib-js)

Ocean-js

From 992096e8e4409686842aea9fc85a17637e15ac85 Mon Sep 17 00:00:00 2001 From: Ahmed Ali Date: Fri, 12 Jun 2020 16:53:42 +0200 Subject: [PATCH 3/4] add oceanprotocol contracts --- package-lock.json | 6 ++++++ package.json | 1 + 2 files changed, 7 insertions(+) diff --git a/package-lock.json b/package-lock.json index 64c763bc..f328bb68 100644 --- a/package-lock.json +++ b/package-lock.json @@ -583,6 +583,12 @@ "fastq": "^1.6.0" } }, + "@oceanprotocol/contracts": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/@oceanprotocol/contracts/-/contracts-0.2.0.tgz", + "integrity": "sha512-7nKNlD2z4FyjQbzBaFJ4JO5jiu3BQG4gESy8ARsq2sXrkSfhDa4RQPuRU9IxubvPZebUkumzmgRt+7afNn+Oew==", + "dev": true + }, "@octokit/auth-token": { "version": "2.4.1", "resolved": "https://registry.npmjs.org/@octokit/auth-token/-/auth-token-2.4.1.tgz", diff --git a/package.json b/package.json index 52166316..01078fc6 100644 --- a/package.json +++ b/package.json @@ -47,6 +47,7 @@ }, "devDependencies": { "@release-it/bumper": "^1.1.0", + "@oceanprotocol/contracts": "0.2.0", "@truffle/hdwallet-provider": "^1.0.33", "@types/chai": "^4.2.11", "@types/chai-spies": "^1.0.1", From a0e4a8dd569015c02cfc25633799211085c73c10 Mon Sep 17 00:00:00 2001 From: Ahmed Ali Date: Tue, 16 Jun 2020 18:27:52 +0200 Subject: [PATCH 4/4] fix travis --- .travis.yml | 2 +- package.json | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index e60cef54..a26af5e7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,7 +21,7 @@ before_script: script: - npm run lint - - npm run build:metadata + - npm run build notifications: email: false \ No newline at end of file diff --git a/package.json b/package.json index 01078fc6..315dc54a 100644 --- a/package.json +++ b/package.json @@ -6,10 +6,9 @@ "typings": "./dist/node/lib.d.ts", "unpkg": "./dist/browser/lib.cjs2.min.js", "scripts": { - "build": "npm run clean && npm run build:tsc && npm run build:dist", + "build": "npm run clean && npm run build:metadata && npm run build:tsc", "build:tsc": "tsc --sourceMap", "build:metadata": "./scripts/get-metadata.js > src/metadata.json", - "build:dist": "cross-env NODE_ENV=production webpack", "clean": "rm -rf ./dist/ ./doc/ ./.nyc_output", "lint": "eslint --ignore-path .gitignore --ext .ts,.tsx .", "format": "prettier --parser typescript --ignore-path .gitignore --write '**/*.{js,jsx,ts,tsx}'",