diff --git a/.travis.yml b/.travis.yml index 53430455c..396594b0a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -30,10 +30,15 @@ jobs: script: - sshpass -p $DEV_MACHINE_PASSWORD ssh -o StrictHostKeyChecking=no $DEV_MACHINE_USERNAME@$DEV_MACHINE_IP "cd /FogController; NODE_ENV=production node src/main.js stop; git pull; npm i; NODE_ENV=production node src/main.js start" - stage: package_build + before_install: + - git clone "https://github.com/$TRAVIS_REPO_SLUG.git" "$TRAVIS_REPO_SLUG"; + - cd "$TRAVIS_REPO_SLUG"; + - git checkout -qf "$TRAVIS_COMMIT"; + - git checkout master before_deploy: - - git config --global user.name "${GITHUB_USERNAME}"; + - git config --global user.name "${GH_USERNAME}"; - git config credential.helper "store --file=.git/credentials"; - - echo "https://${GITHUB_API_KEY}:@github.com" > .git/credentials; + - echo "https://${GH_TOKEN}:@github.com" > .git/credentials; - npm run automatic-release deploy: skip_cleanup: true diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 000000000..471c9682e --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,24 @@ +# Changelog + +Also see the **[release page](https://github.com/ioFog/Controller/releases)**. + +
+ +## [1.0.20](https://github.com/ioFog/Controller/releases/tag/1.0.20) (2018-11-24) + + +
+ +## [1.0.19](https://github.com/ioFog/Controller/releases/tag/1.0.19) (2018-11-22) + + +
+ +## [1.0.0](https://github.com/ioFog/Controller/releases/tag/1.0.0) (2018-10-30) + + +
+ +--- + +*Changelog generated automatically by [automatic-release](https://github.com/dominique-mueller/automatic-release).* diff --git a/package.json b/package.json index 4f84e0478..0c7d598e4 100644 --- a/package.json +++ b/package.json @@ -1,84 +1,84 @@ { - "name": "iofogcontroller", - "version": "1.0.19", - "description": "ioFog Controller project for Eclipse IoFog @ iofog.org \\nCopyright (c) 2018 Edgeworx, Inc.", - "main": "./src/main.js", - "author": "Saeid Baghbidi", - "contributors": [ - "Kilton Hopkins ", - "Saeid Baghbidi", - "Pavel Kazlou", - "Egor Krylovich", - "Iryna Laryionava", - "Maryna Lipnitskaya", - "Dmitriy Kudasov", - "Dmitry Stolbunov", - "Darya Busel", - "Alexander Shpak", - "Kate Lukashick", - "Eugene Pankov", - "Maksim Chepelev", - "Tetiana Yatsiuk", - "Sergey Valevich" - ], - "license": { - "type": "EPL-2.0", - "url": "https://www.eclipse.org/legal/epl-v20.html" - }, - "bugs": { - "email": "edgemaster@iofog.org" - }, - "homepage": "https://www.iofog.org", - "repository": { - "type": "git", - "url": "https://github.com/ioFog/Controller" - }, - "scripts": { - "start": "NODE_ENV=production node ./src/main.js start", - "start-dev": "NODE_ENV=development node ./src/main.js start", - "build": "export NODE_ENV=production && cd src/sequelize && ../../node_modules/.bin/sequelize db:migrate && ../../node_modules/.bin/sequelize db:seed:all", - "preuninstall": "bash scripts/preuninstall.sh", - "postinstall": "bash scripts/postinstall.sh", - "lint": "./node_modules/.bin/eslint \"**/*.js\"", - "automatic-release": "automatic-release" - }, - "preferGlobal": true, - "bin": { - "iofog-controller": "src/main.js" - }, - "dependencies": { - "body-parser": "^1.18.3", - "command-line-args": "^5.0.2", - "command-line-usage": "^5.0.5", - "continuation-local-storage": "^3.2.1", - "cookie-parser": "^1.4.3", - "daemonize2": "^0.4.2", - "ejs": "^2.6.1", - "express": "^4.16.3", - "formidable": "^1.2.1", - "fs": "^0.0.1-security", - "ftp": "^0.3.10", - "helmet": "^3.13.0", - "jsonschema": "^1.2.4", - "morgan": "^1.9.1", - "nconf": "^0.10.0", - "nodemailer": "^4.6.8", - "nodemailer-smtp-transport": "^2.7.4", - "path": "^0.12.7", - "portscanner": "^2.2.0", - "retry-as-promised": "^3.1.0", - "sequelize": "^4.39.0", - "sequelize-cli": "^4.1.1", - "sqlite3": "^4.0.2", - "string-format": "^2.0.0", - "umzug": "^2.1.0", - "underscore": "^1.9.1", - "winston": "^3.1.0", - "xss-clean": "^0.1.1", - "qs": "^6.5.2" - }, - "devDependencies": { - "automatic-release": "^1.1.1", - "eslint": "^5.6.1" - } + "name": "iofogcontroller", + "version": "1.0.20", + "description": "ioFog Controller project for Eclipse IoFog @ iofog.org \\nCopyright (c) 2018 Edgeworx, Inc.", + "main": "./src/main.js", + "author": "Saeid Baghbidi", + "contributors": [ + "Kilton Hopkins ", + "Saeid Baghbidi", + "Pavel Kazlou", + "Egor Krylovich", + "Iryna Laryionava", + "Maryna Lipnitskaya", + "Dmitriy Kudasov", + "Dmitry Stolbunov", + "Darya Busel", + "Alexander Shpak", + "Kate Lukashick", + "Eugene Pankov", + "Maksim Chepelev", + "Tetiana Yatsiuk", + "Sergey Valevich" + ], + "license": { + "type": "EPL-2.0", + "url": "https://www.eclipse.org/legal/epl-v20.html" + }, + "bugs": { + "email": "edgemaster@iofog.org" + }, + "homepage": "https://www.iofog.org", + "repository": { + "type": "git", + "url": "https://github.com/ioFog/Controller" + }, + "scripts": { + "start": "NODE_ENV=production node ./src/main.js start", + "start-dev": "NODE_ENV=development node ./src/main.js start", + "build": "export NODE_ENV=production && cd src/sequelize && ../../node_modules/.bin/sequelize db:migrate && ../../node_modules/.bin/sequelize db:seed:all", + "preuninstall": "bash scripts/preuninstall.sh", + "postinstall": "bash scripts/postinstall.sh", + "lint": "./node_modules/.bin/eslint \"**/*.js\"", + "automatic-release": "automatic-release" + }, + "preferGlobal": true, + "bin": { + "iofog-controller": "src/main.js" + }, + "dependencies": { + "body-parser": "^1.18.3", + "command-line-args": "^5.0.2", + "command-line-usage": "^5.0.5", + "continuation-local-storage": "^3.2.1", + "cookie-parser": "^1.4.3", + "daemonize2": "^0.4.2", + "ejs": "^2.6.1", + "express": "^4.16.3", + "formidable": "^1.2.1", + "fs": "^0.0.1-security", + "ftp": "^0.3.10", + "helmet": "^3.13.0", + "jsonschema": "^1.2.4", + "morgan": "^1.9.1", + "nconf": "^0.10.0", + "nodemailer": "^4.6.8", + "nodemailer-smtp-transport": "^2.7.4", + "path": "^0.12.7", + "portscanner": "^2.2.0", + "retry-as-promised": "^3.1.0", + "sequelize": "^4.39.0", + "sequelize-cli": "^4.1.1", + "sqlite3": "^4.0.2", + "string-format": "^2.0.0", + "umzug": "^2.1.0", + "underscore": "^1.9.1", + "winston": "^3.1.0", + "xss-clean": "^0.1.1", + "qs": "^6.5.2" + }, + "devDependencies": { + "automatic-release": "^1.1.1", + "eslint": "^5.6.1" + } }