Skip to content

Commit

Permalink
travis, appveyour fixes, electron compile TS fix
Browse files Browse the repository at this point in the history
  • Loading branch information
DutchKevv committed May 20, 2017
1 parent ba156da commit 9220253
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ install:

script:
- cd electron
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; npm run test:e2e; fi
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then npm run test:e2e; fi
- cd ../

deploy:
Expand Down
6 changes: 3 additions & 3 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,11 @@ artifacts:

deploy:
provider: GitHub
# force_update: true
force_update: true
auth_token:
secure: zpV8PaX1ewIXIJgt8lEIqkt9pqWZRP4dJ+zCeuJEdgOQbWILKi96CcCw6loNKQ93
draft: false
prerelease: true
artifect: setup
# on:
# appveyor_repo_tag: true
on:
appveyor_repo_tag: true
8 changes: 4 additions & 4 deletions server/controllers/EditorController.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import * as path from 'path';
import * as winston from 'winston-color';
import * as mkdirp from 'mkdirp';
import * as watch from 'watch';
import {fork, spawn} from 'child_process';
import {fork} from 'child_process';
import Base from '../classes/Base';

const dirTree = require('directory-tree');
Expand Down Expand Up @@ -209,13 +209,13 @@ export default class EditorController extends Base {

return new Promise((resolve, reject) => {

let npm = this.app.isWin ? 'npm.cmd' : 'npm',
let gulpPath = path.join(__dirname, '..', 'node_modules', 'gulp', 'bin', 'gulp.js'),
childOpt = {
stdio: ['pipe', process.stdout, process.stderr],
stdio: ['pipe', process.stdout, process.stderr, 'ipc'],
cwd: path.join(__dirname, '../')
}, child;

child = spawn(npm, ['run', 'build:custom', `--input-path=${inputPath}`, `--output-path=${outputPath}`], childOpt);
child = fork(gulpPath, ['custom:build', `--input-path=${inputPath}`, `--output-path=${outputPath}`], childOpt);

child.on('close', (code) => {
console.log(`child process exited with code ${code}`);
Expand Down

0 comments on commit 9220253

Please sign in to comment.