Skip to content

Hotfix: excludes #91

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.

Sign up for GitHub

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
DeviaVir merged 10 commits into from
Apr 22, 2016
Merged

Hotfix: excludes #91

Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
cf08e28
Runhandler: Hotfixes
Apr 12, 2016
cc48902
Merge remote-tracking branch 'upstream/master'
Apr 15, 2016
07b2edc
Merge remote-tracking branch 'upstream/master'
Apr 18, 2016
13ea71d
Merge remote-tracking branch 'upstream/master'
Apr 18, 2016
2671fd5
Merge remote-tracking branch 'upstream/master'
Apr 18, 2016
fdbbe60
Remove AWS_MODE
Apr 18, 2016
9c94a46
Set nodejs4.3 as default
Apr 18, 2016
ed10506
Merge remote-tracking branch 'upstream/master'
Apr 22, 2016
98e89a5
Fix #87
Apr 22, 2016
ccac897
node_modules should not be ignored, lambda needs it!
Apr 22, 2016
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
16 changes: 8 additions & 8 deletions lib/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,14 +138,14 @@ Lambda.prototype._zipfileTmpPath = function (program) {
};

Lambda.prototype._rsync = function (program, codeDirectory, callback) {
var excludes = ['.git*', '*.swp', '.editorconfig', 'deploy.env', '*.log', 'node_modules'],
excludeArgs = '';
var excludes = ['.git*', '*.swp', '.editorconfig', 'deploy.env', '*.log', 'build/'],
excludeGlobs = [];
if (program.excludeGlobs) {
var excludeGlobs = program.excludeGlobs.split(' ');
excludeArgs = excludeGlobs.concat(excludes).map(function(exclude) {
return '--exclude=' + exclude;
}).join(' ');
excludeGlobs = program.excludeGlobs.split(' ');
}
var excludeArgs = excludeGlobs.concat(excludes).map(function(exclude) {
return '--exclude=' + exclude;
}).join(' ');

exec('mkdir -p ' + codeDirectory, function(err) {
if (err) {
Expand Down Expand Up @@ -335,12 +335,12 @@ Lambda.prototype._archive = function (program, archive_callback) {
var _this = this;
var codeDirectory = _this._codeDirectory(program);

console.log('=> Moving files to temporary directory');
// Move all files to tmp folder (except .git, .log, event.json and node_modules)
_this._cleanDirectory(codeDirectory, function(err) {
if (err) {
return archive_callback(err);
}
console.log('=> Moving files to temporary directory');
// Move files to tmp folder
_this._rsync(program, codeDirectory, function (err) {
if (err) {
return archive_callback(err);
Expand Down