Skip to content
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

fix: fix linux-specific shellscript errors and integ test #229

Merged
merged 2 commits into from
Aug 13, 2018
Merged
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
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ describe('GET /hello', () => {
it('respond with message from hello-function', (done) => {
agent
.get("/hello")
.expect(200, { message: "Hello there, I'm a function" })
.expect(200, { message: "Hello there, I'm an OpenFaaS function" })
.end((err) => {
if (err) return done(err)
done()
Expand Down
6 changes: 3 additions & 3 deletions garden-cli/static/openfaas/openfaas-builder/bootstrap.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env bash -eo pipefail
#!/bin/bash
set -e

here=$(cd `dirname $0` && pwd)
cli_filename="faas-cli"

if [ "${PLATFORM}" = "darwin" ]; then
Expand All @@ -11,7 +11,7 @@ fi

# use npx for cross-platform compatibility
npx node-wget -- https://github.com/openfaas/faas-cli/releases/download/0.6.15/${cli_filename}
mv ${cli_filename} faas-cli
mv ${cli_filename} faas-cli || true
chmod +x faas-cli

./faas-cli template pull
3 changes: 2 additions & 1 deletion garden-cli/test/integ/run
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#!/usr/bin/env bash -eo pipefail
#!/bin/bash
set -e

here=$(cd `dirname $0` && pwd)
garden_root=$(cd ${here} && cd $(git rev-parse --show-toplevel) && pwd)
Expand Down