Skip to content

Commit

Permalink
Merge branch 'release/1.0.10'
Browse files Browse the repository at this point in the history
  • Loading branch information
hal313 committed Mar 9, 2021
2 parents 65789bc + fa743a0 commit 44c386a
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 11 deletions.
22 changes: 16 additions & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,21 @@
language: node_js
node_js:
- '10'
before_install:
## The apt "awscli" client does not support Lambda yet; use pip
- sudo apt-get install -y python3-pip
- sudo pip3 install awscli
- npm install
- 10
addons:
apt:
packages:
# Ubuntu 16+ does not install this dependency by default, so we need to install it ourselves
- libgconf-2-4
- awscli
cache:
npm: true
directories:
# we also need to cache folder with Cypress binary
- ~/.cache
install:
- npm ci
before_script:
- npm install cypress
script:
- .travis/build.sh
notifications:
Expand Down
8 changes: 4 additions & 4 deletions .travis/build.sh
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
#!/bin/bash

## Deploys the HTML and API
echo "Building on branch: $TRAVIS_BRANCH"
npm test

if [[ 'master' == $TRAVIS_BRANCH ]]; then
echo "Deploying on branch: $TRAVIS_BRANCH"
set AWS_ACCESS_KEY_ID=$AWS_ACCESS_KEY_ID
set AWS_SECRET_ACCESS_KEY=$AWS_SECRET_ACCESS_KEY
set AWS_DEFAULT_REGION=$AWS_DEFAULT_REGION
set AWS_BUCKET=$AWS_BUCKET
npm run deploy
else
echo "Building on branch: $TRAVIS_BRANCH"
npm test
fi
fi
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "aws-s3-lambda-example",
"version": "1.0.9",
"version": "1.0.10",
"description": "A sample application showcasing AWS S3, Lamda and Gateway API",
"directories": {
"test": "test"
Expand Down

0 comments on commit 44c386a

Please sign in to comment.