Improve development files
This commit is contained in:
parent
f5ce8ae5a1
commit
6316df3c20
1
.gitignore
vendored
1
.gitignore
vendored
|
@ -3,4 +3,5 @@ build/
|
||||||
release/
|
release/
|
||||||
npm-debug.log
|
npm-debug.log
|
||||||
|
|
||||||
|
test-results.xml
|
||||||
test_config.json
|
test_config.json
|
||||||
|
|
|
@ -1,10 +1,11 @@
|
||||||
machine:
|
machine:
|
||||||
node:
|
node:
|
||||||
version: 4.2.2
|
version: 4.2.2
|
||||||
|
services:
|
||||||
|
- docker
|
||||||
|
|
||||||
dependencies:
|
dependencies:
|
||||||
post:
|
post:
|
||||||
- sudo service docker start
|
|
||||||
- docker build -t $CIRCLE_USERNAME/em-builder docker
|
- docker build -t $CIRCLE_USERNAME/em-builder docker
|
||||||
- docker run --rm -it -v `pwd`:/home/xclient/electron-mattermost $CIRCLE_USERNAME/em-builder ./electron-mattermost/docker/package_in_docker.sh
|
- docker run --rm -it -v `pwd`:/home/xclient/electron-mattermost $CIRCLE_USERNAME/em-builder ./electron-mattermost/docker/package_in_docker.sh
|
||||||
- mv release/electron-mattermost-win32-ia32 release/electron-mattermost-win32
|
- mv release/electron-mattermost-win32-ia32 release/electron-mattermost-win32
|
||||||
|
@ -16,6 +17,12 @@ dependencies:
|
||||||
- tar zcvf $CIRCLE_ARTIFACTS/electron-mattermost-linux-ia32.tar.gz -C release electron-mattermost-linux-ia32
|
- tar zcvf $CIRCLE_ARTIFACTS/electron-mattermost-linux-ia32.tar.gz -C release electron-mattermost-linux-ia32
|
||||||
- tar zcvf $CIRCLE_ARTIFACTS/electron-mattermost-linux-x64.tar.gz -C release electron-mattermost-linux-x64
|
- tar zcvf $CIRCLE_ARTIFACTS/electron-mattermost-linux-x64.tar.gz -C release electron-mattermost-linux-x64
|
||||||
|
|
||||||
|
test:
|
||||||
|
override:
|
||||||
|
- node_modules/.bin/mocha --reporter mocha-circleci-reporter
|
||||||
|
post:
|
||||||
|
- mv test-results.xml $CIRCLE_TEST_REPORTS/
|
||||||
|
|
||||||
deployment:
|
deployment:
|
||||||
release:
|
release:
|
||||||
tag: /v[0-9]+(\.[0-9]+)*/
|
tag: /v[0-9]+(\.[0-9]+)*/
|
||||||
|
|
|
@ -2,4 +2,4 @@
|
||||||
# This script should be executed in docker container.
|
# This script should be executed in docker container.
|
||||||
set -ex
|
set -ex
|
||||||
cd electron-mattermost
|
cd electron-mattermost
|
||||||
./node_modules/gulp/bin/gulp.js package:all
|
npm run package:all
|
||||||
|
|
10
gulpfile.js
10
gulpfile.js
|
@ -42,7 +42,7 @@ gulp.task('prettify:jsx', function() {
|
||||||
plugins: ['esformatter-jsx']
|
plugins: ['esformatter-jsx']
|
||||||
}))
|
}))
|
||||||
.pipe(gulp.dest(app_root));
|
.pipe(gulp.dest(app_root));
|
||||||
})
|
});
|
||||||
|
|
||||||
gulp.task('build', ['build:jsx']);
|
gulp.task('build', ['build:jsx']);
|
||||||
|
|
||||||
|
@ -57,13 +57,15 @@ gulp.task('build:jsx', function() {
|
||||||
.pipe(gulp.dest('src/browser/build'));
|
.pipe(gulp.dest('src/browser/build'));
|
||||||
});
|
});
|
||||||
|
|
||||||
gulp.task('serve', function() {
|
gulp.task('serve', ['build'], function() {
|
||||||
var options = ['--livereload'];
|
var options = ['--livereload'];
|
||||||
electron.start(options);
|
electron.start(options);
|
||||||
gulp.watch(sources, function() {
|
gulp.watch(['src/**', '!src/browser/**', '!src/node_modules/**'], function() {
|
||||||
electron.broadcast('stop');
|
|
||||||
electron.restart(options);
|
electron.restart(options);
|
||||||
});
|
});
|
||||||
|
gulp.watch('src/browser/**/*.jsx', ['build:jsx']);
|
||||||
|
gulp.watch(['src/browser/**', '!src/browser/**/*.jsx'], electron.reload);
|
||||||
|
gulp.watch('gulpfile.js', process.exit);
|
||||||
});
|
});
|
||||||
|
|
||||||
function makePackage(platform, arch, callback) {
|
function makePackage(platform, arch, callback) {
|
||||||
|
|
16
package.json
16
package.json
|
@ -6,9 +6,18 @@
|
||||||
"author": "Yuya Ochiai",
|
"author": "Yuya Ochiai",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"postinstall": "cd src && npm install",
|
"install": "cd src && npm install",
|
||||||
"start": "gulp build && electron src",
|
"postinstall": "npm run build",
|
||||||
"test": "gulp build && mocha"
|
"build": "gulp build",
|
||||||
|
"start": "electron src",
|
||||||
|
"serve": "gulp serve",
|
||||||
|
"test": "gulp build && mocha",
|
||||||
|
"package": "gulp package",
|
||||||
|
"package:windows": "gulp package:windows",
|
||||||
|
"package:osx": "gulp package:osx",
|
||||||
|
"package:linux": "gulp package:linux",
|
||||||
|
"package:all": "gulp package:all",
|
||||||
|
"prettify": "gulp prettify"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"babel-preset-react": "^6.3.13",
|
"babel-preset-react": "^6.3.13",
|
||||||
|
@ -25,6 +34,7 @@
|
||||||
"gulp-esformatter": "^5.0.0",
|
"gulp-esformatter": "^5.0.0",
|
||||||
"gulp-jsbeautifier": "^1.0.1",
|
"gulp-jsbeautifier": "^1.0.1",
|
||||||
"mocha": "^2.3.4",
|
"mocha": "^2.3.4",
|
||||||
|
"mocha-circleci-reporter": "0.0.1",
|
||||||
"should": "^8.0.1",
|
"should": "^8.0.1",
|
||||||
"webdriverio": "^3.3.0"
|
"webdriverio": "^3.3.0"
|
||||||
}
|
}
|
||||||
|
|
|
@ -16,8 +16,8 @@ var argv = require('yargs').argv;
|
||||||
var client = null;
|
var client = null;
|
||||||
if (argv.livereload) {
|
if (argv.livereload) {
|
||||||
client = require('electron-connect').client.create();
|
client = require('electron-connect').client.create();
|
||||||
client.on('stop', function() {
|
client.on('reload', function() {
|
||||||
app.quit();
|
mainWindow.reload();
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue