Skip to content

Csv #23

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 24, 2019
Merged

Csv #23

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -110,3 +110,5 @@ crashlytics.properties
crashlytics-build.properties
fabric.properties

dist/
.vscode/
7 changes: 6 additions & 1 deletion config.js
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,11 @@ exports = module.exports = {
SOURCE_FILE: 'script.rb',
CPU_SHARE: "0.8",
MEM_LIMIT: '300m'
}
},
'csv': {
SOURCE_FILE: 'script.py',
CPU_SHARE: "0.8",
MEM_LIMIT: '500m',
},
}
}
28 changes: 0 additions & 28 deletions dist/taskmaster.js

This file was deleted.

1 change: 0 additions & 1 deletion dist/taskmaster.js.map

This file was deleted.

38 changes: 0 additions & 38 deletions dist/tasks/run.js

This file was deleted.

1 change: 0 additions & 1 deletion dist/tasks/run.js.map

This file was deleted.

6 changes: 3 additions & 3 deletions src/tasks/run.ts
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,10 @@ function execRun (job: RunJob, executed: (result: RunResult) => void) {
bash -c "/bin/compile.sh && /bin/run.sh"
`)

let stdout = cat(path.join(currentJobDir, 'run.stdout')).toString()
let stdout = cat(path.join(currentJobDir, 'run.stdout'))

// Check for compile_stderr if no stdout found
let compile_stderr = stdout ? '' : cat(path.join(currentJobDir, 'compile.stderr'))
// Check for compile_stderr if can't find a stdout file ; stdout can be ''
let compile_stderr = stdout.stderr ? cat(path.join(currentJobDir, 'compile.stderr')) : ''
let stderr = compile_stderr || cat((path.join(currentJobDir, 'run.stderr')).toString())

executed({
Expand Down
Loading