From 79e4c02f92969f7aaa77f0413b1f61df21090db7 Mon Sep 17 00:00:00 2001 From: Ovidiu Serban Date: Fri, 23 Nov 2018 14:51:22 +0000 Subject: [PATCH 1/4] travis build script --- package.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 1101ec84..fb15355c 100644 --- a/package.json +++ b/package.json @@ -2,12 +2,13 @@ "name": "ove", "private": true, "license": "MIT", - "scripts": { - "install": "lerna bootstrap --hoist", + "scripts": { + "install": "lerna bootstrap --hoist --no-ci", "install:prod": "lerna bootstrap --hoist -- --production --no-optional", "clean": "lerna run clean", "build": "lerna run build", "build:clean": "lerna run clean && lerna run build", + "lint": "lerna run lint", "test": "lerna run test", "start": "OVE_HOST='localhost:8080' TUORIS_HOST='localhost:7080' pm2 start pm2.json", "start:windows": "OVE_HOST='localhost:8080' TUORIS_HOST='localhost:7080' pm2 start pm2-windows.json", From 3c74425e6d6102147624ead305a425a9d4674918 Mon Sep 17 00:00:00 2001 From: Ovidiu Serban Date: Fri, 23 Nov 2018 14:51:35 +0000 Subject: [PATCH 2/4] travis build script --- .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..7a008337 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,26 @@ +sudo: false +language: node_js +node_js: stable + +services: + - docker + +install: npm install + +stages: + - test + - name: deploy + if: branch = master AND type != pull_request + +jobs: + include: + - stage: test + script: + - npm run lint + - npm run build:clean + - npm test + - stage: deploy + script: + - echo "${DOCKER_PASSWORD}" | docker login -u "${DOCKER_USERNAME}" --password-stdin + - ./build.sh --push + From cd3b9e549d3da9deb03a7376c1cce04ab02c770f Mon Sep 17 00:00:00 2001 From: Ovidiu Serban Date: Mon, 26 Nov 2018 15:07:40 +0000 Subject: [PATCH 3/4] Exit 0 for now until we have tests --- .travis.yml | 2 +- packages/ove-app-alignment/package.json | 2 +- packages/ove-app-audio/package.json | 2 +- packages/ove-app-charts/package.json | 2 +- packages/ove-app-html/package.json | 2 +- packages/ove-app-images/package.json | 2 +- packages/ove-app-maps/package.json | 2 +- packages/ove-app-networks/package.json | 2 +- packages/ove-app-svg/package.json | 2 +- packages/ove-app-videos/package.json | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7a008337..cba0f9ea 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,5 +22,5 @@ jobs: - stage: deploy script: - echo "${DOCKER_PASSWORD}" | docker login -u "${DOCKER_USERNAME}" --password-stdin - - ./build.sh --push + - ./build.sh --push -v unstable diff --git a/packages/ove-app-alignment/package.json b/packages/ove-app-alignment/package.json index c6401e50..e24a470d 100644 --- a/packages/ove-app-alignment/package.json +++ b/packages/ove-app-alignment/package.json @@ -4,7 +4,7 @@ "version": "0.2.0", "main": "dist/index.js", "scripts": { - "test": "echo \"Error: no test specified\" && exit 1", + "test": "echo \"No tests specified\" && exit 0", "clean": "npx rimraf dist", "build": "npx babel-cli src --out-dir dist --copy-files", "start": "node dist/index.js --color", diff --git a/packages/ove-app-audio/package.json b/packages/ove-app-audio/package.json index 9c3b8f23..f5fb50f9 100644 --- a/packages/ove-app-audio/package.json +++ b/packages/ove-app-audio/package.json @@ -4,7 +4,7 @@ "version": "0.2.0", "main": "dist/index.js", "scripts": { - "test": "echo \"Error: no test specified\" && exit 1", + "test": "echo \"No tests specified\" && exit 0", "clean": "npx rimraf dist", "build": "npx babel src --out-dir dist --copy-files", "start": "node dist/index.js --color", diff --git a/packages/ove-app-charts/package.json b/packages/ove-app-charts/package.json index ae18ce0e..8f665e79 100644 --- a/packages/ove-app-charts/package.json +++ b/packages/ove-app-charts/package.json @@ -4,7 +4,7 @@ "version": "0.2.0", "main": "dist/index.js", "scripts": { - "test": "echo \"Error: no test specified\" && exit 1", + "test": "echo \"No tests specified\" && exit 0", "clean": "npx rimraf dist", "build": "npx babel-cli src --out-dir dist --copy-files", "start": "node dist/index.js --color", diff --git a/packages/ove-app-html/package.json b/packages/ove-app-html/package.json index b5f06ff8..d2885920 100644 --- a/packages/ove-app-html/package.json +++ b/packages/ove-app-html/package.json @@ -4,7 +4,7 @@ "version": "0.2.0", "main": "dist/index.js", "scripts": { - "test": "echo \"Error: no test specified\" && exit 1", + "test": "echo \"No tests specified\" && exit 0", "clean": "npx rimraf dist", "build": "npx babel-cli src --out-dir dist --copy-files", "start": "node dist/index.js --color", diff --git a/packages/ove-app-images/package.json b/packages/ove-app-images/package.json index 6388a6b3..b1892209 100644 --- a/packages/ove-app-images/package.json +++ b/packages/ove-app-images/package.json @@ -4,7 +4,7 @@ "version": "0.2.0", "main": "dist/index.js", "scripts": { - "test": "echo \"Error: no test specified\" && exit 1", + "test": "echo \"No tests specified\" && exit 0", "clean": "npx rimraf dist", "build": "npx babel-cli src --out-dir dist --copy-files", "start": "node dist/index.js --color", diff --git a/packages/ove-app-maps/package.json b/packages/ove-app-maps/package.json index 0d1eb6f8..5b14d637 100644 --- a/packages/ove-app-maps/package.json +++ b/packages/ove-app-maps/package.json @@ -4,7 +4,7 @@ "version": "0.2.0", "main": "dist/index.js", "scripts": { - "test": "echo \"Error: no test specified\" && exit 1", + "test": "echo \"No tests specified\" && exit 0", "clean": "npx rimraf dist", "build": "npx babel-cli src --out-dir dist --copy-files", "start": "node dist/index.js --color", diff --git a/packages/ove-app-networks/package.json b/packages/ove-app-networks/package.json index e63385ec..3e43c319 100644 --- a/packages/ove-app-networks/package.json +++ b/packages/ove-app-networks/package.json @@ -4,7 +4,7 @@ "version": "0.2.0", "main": "dist/index.js", "scripts": { - "test": "echo \"Error: no test specified\" && exit 1", + "test": "echo \"No tests specified\" && exit 0", "clean": "npx rimraf dist", "build": "npx babel-cli src --out-dir dist --copy-files", "start": "node dist/index.js --color", diff --git a/packages/ove-app-svg/package.json b/packages/ove-app-svg/package.json index 41b4a494..d59407cb 100644 --- a/packages/ove-app-svg/package.json +++ b/packages/ove-app-svg/package.json @@ -4,7 +4,7 @@ "version": "0.2.0", "main": "dist/index.js", "scripts": { - "test": "echo \"Error: no test specified\" && exit 1", + "test": "echo \"No tests specified\" && exit 0", "clean": "npx rimraf dist", "build": "npx babel-cli src --out-dir dist --copy-files", "start": "node dist/index.js --color", diff --git a/packages/ove-app-videos/package.json b/packages/ove-app-videos/package.json index 5e27a9ab..9aeb9d49 100644 --- a/packages/ove-app-videos/package.json +++ b/packages/ove-app-videos/package.json @@ -4,7 +4,7 @@ "version": "0.2.0", "main": "dist/index.js", "scripts": { - "test": "echo \"Error: no test specified\" && exit 1", + "test": "echo \"No tests specified\" && exit 0", "clean": "npx rimraf dist", "build": "npx babel-cli src --out-dir dist --copy-files", "start": "node dist/index.js --color", From 69e59020001251e76ae7207d633819349a3e10bb Mon Sep 17 00:00:00 2001 From: Ovidiu Serban Date: Tue, 27 Nov 2018 16:30:17 +0000 Subject: [PATCH 4/4] travis version + unstable --- .travis.yml | 2 +- build.sh | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index cba0f9ea..7a008337 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,5 +22,5 @@ jobs: - stage: deploy script: - echo "${DOCKER_PASSWORD}" | docker login -u "${DOCKER_USERNAME}" --password-stdin - - ./build.sh --push -v unstable + - ./build.sh --push diff --git a/build.sh b/build.sh index 7ad0400b..5e5ca558 100755 --- a/build.sh +++ b/build.sh @@ -20,6 +20,7 @@ version=$(git describe --tags --exact-match 2> /dev/null) if [ $? -ne 0 ]; then version="latest" fi +version="${version}-unstable" pushImage=false