Skip to content

Better mixed runtime & function deploy handling #180

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
merged 12 commits into from
Apr 26, 2018
Merged

Better mixed runtime & function deploy handling #180

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
f4390b2
Better mixed runtime & function deploy handling
dschep Apr 23, 2018
87ac229
another tweak
dschep Apr 23, 2018
182ff01
fix again?
dschep Apr 23, 2018
a902f17
Fix corrupted zip archive in case of same module
st4lk Apr 25, 2018
72d8d69
Do not try to install requirements for non-python runtime
st4lk Apr 25, 2018
5fe5e6c
Fix lint
st4lk Apr 25, 2018
a8880a1
Merge remote-tracking branch 'st4lk/fix-corrupted-zip-archive' into i…
dschep Apr 25, 2018
14eb21e
format
dschep Apr 25, 2018
1d602de
update test for merging #181
dschep Apr 25, 2018
f98cc9c
@andrewFarley's fix
dschep Apr 25, 2018
97c9fd3
huh. depcheck sucks.
dschep Apr 25, 2018
c4c64bb
fixix syntax error
dschep Apr 25, 2018
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: 1 addition & 1 deletion lib/inject.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ function injectAllRequirements(funcArtifact) {
} else {
return injectRequirements(
path.join('.serverless', 'requirements'),
this.serverless.service.package.artifact,
this.serverless.service.package.artifact || funcArtifact
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Getting a syntax error. I think you're missing the , at end of line.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah. yes! (and that's probably why depcheck didn't think we use glob-all too)

this.options
);
}
Expand Down