From 0e9bf2d42dced85a26faa94084def405b90662b1 Mon Sep 17 00:00:00 2001 From: Dariusz Niemczyk Date: Sun, 26 Feb 2017 18:24:37 +0100 Subject: [PATCH] First try to fix installation for plantingjs django app. --- .gitignore | 2 ++ .travis.yml | 20 ++++++++++++++------ github_deploy_key.enc | Bin 0 -> 3248 bytes gulpfile.babel.js | 18 +++++++++++++++++- package.json | 12 +++++++----- src/deploy_package.json | 14 ++++++++++++++ travis_deploy.sh | 15 +++++++++++++++ 7 files changed, 69 insertions(+), 12 deletions(-) create mode 100644 github_deploy_key.enc create mode 100644 src/deploy_package.json create mode 100644 travis_deploy.sh diff --git a/.gitignore b/.gitignore index 55ed84c..e1e560e 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,5 @@ coverage/ *.pyc settings.json .tern-port +github_deploy_key +github_deploy_key.pub diff --git a/.travis.yml b/.travis.yml index 08ebcb9..4fc71fe 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,11 +1,19 @@ language: node_js node_js: - - "4.2.4" +- node install: - - "npm install" +- npm install script: - - "npm run build" - - "npm run lint" - - "npm run test" +- npm run lint +- npm run test +- if [ "$TRAVIS_BRANCH" == "master" ]; then + npm start; + bash travis_deploy.sh; + else + npm run build; + fi after_success: - - "npm run codecov" +- npm run codecov +env: + global: + - GH_REF: komitywa/plantingjs.git diff --git a/github_deploy_key.enc b/github_deploy_key.enc new file mode 100644 index 0000000000000000000000000000000000000000..58302ae293c3d72bb0f685b4bba51984ed7cbae1 GIT binary patch literal 3248 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 literal 0 HcmV?d00001 diff --git a/gulpfile.babel.js b/gulpfile.babel.js index 193beb9..1933d2a 100755 --- a/gulpfile.babel.js +++ b/gulpfile.babel.js @@ -11,7 +11,7 @@ import csso from 'gulp-csso'; import del from 'del'; import domain from 'domain'; import eslint from 'gulp-eslint'; -import { existsSync, readFileSync } from 'fs'; +import { existsSync, readFileSync, writeFileSync } from 'fs'; import flatten from 'gulp-flatten'; import filter from 'gulp-filter'; import gif from 'gulp-if'; @@ -33,6 +33,8 @@ import size from 'gulp-size'; import tap from 'gulp-tap'; import useref from 'gulp-useref'; +import {resolve} from 'path'; + const SETTINGS_PATH = './settings.json'; const settings = existsSync(SETTINGS_PATH) ? JSON.parse(readFileSync(SETTINGS_PATH, 'utf-8')) : {}; @@ -46,6 +48,20 @@ gulp.task('default', function() { gulp.start('build'); }); +gulp.task('deploy_json', ['clean'], function(cb) { + return sequence( + 'clean', + ['js', 'css', 'fonts', 'extras'], + 'buildsize', + cb + ); +}); + +gulp.task('autodeploy', ['clean', 'deploy_json'], function() { + const file = readFileSync(resolve(__dirname, './src/deploy_package.json'), 'utf-8'); + return writeFileSync('./dist/package.json', file); +}); + /* Removing whole ./dist directory */ gulp.task('clean', del.bind(null, './dist')); diff --git a/package.json b/package.json index 7a3a8f6..99c9054 100644 --- a/package.json +++ b/package.json @@ -5,11 +5,13 @@ "bugs": "https://github.com/komitywa/plantingjs/issues", "license": "MIT", "scripts": { - "serve": "./node_modules/.bin/gulp serve", - "build": "./node_modules/.bin/gulp build", - "lint": "./node_modules/.bin/gulp lint", - "test": "./node_modules/.bin/gulp test", - "codecov": "./node_modules/.bin/codecov" + "serve": "gulp serve", + "build": "gulp build", + "lint": "gulp lint", + "test": "gulp test", + "codecov": "codecov", + "postinstall": "gulp", + "start": "gulp autodeploy" }, "author": { "name": "Komitywa", diff --git a/src/deploy_package.json b/src/deploy_package.json new file mode 100644 index 0000000..805d7ff --- /dev/null +++ b/src/deploy_package.json @@ -0,0 +1,14 @@ +{ + "name": "plantingjs", + "version": "0.0.1", + "bugs": "https://github.com/komitywa/plantingjs/issues", + "license": "MIT", + "scripts": {}, + "author": { + "name": "Komitywa", + "email": "komitywapoznan@gmail.com", + "url": "http://komitywa.org" + }, + "private": true, + "main": "./js/main.js" +} diff --git a/travis_deploy.sh b/travis_deploy.sh new file mode 100644 index 0000000..21d1db9 --- /dev/null +++ b/travis_deploy.sh @@ -0,0 +1,15 @@ +#!/bin/bash +set -e # exit with nonzero exit code if anything fails + +openssl aes-256-cbc -K $encrypted_7a9f37839964_key -iv $encrypted_7a9f37839964_iv -in github_deploy_key.enc -out github_deploy_key -d +chmod 600 github_deploy_key +eval `ssh-agent -s` +ssh-add github_deploy_key + +cd dist +git init +git config user.name "Travis CI" +git config user.email "travis@kdp.pl" +git add . +git commit -m "Automatic deploy of compiled library" +git push --force --quiet "git@github.com:${GH_REF}" master:autodeploy > /dev/null 2>&1