Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
Prev Previous commit
Next Next commit
Merge branch 'master' into travis-shell-expansion
  • Loading branch information
chorrell authored Jul 13, 2017
commit 2e625b629f33fa99d366db90157b84b2759ea139
19 changes: 15 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,18 @@ script:
fi

env:
matrix :
- NODE_VERSION: '4.*'
- NODE_VERSION: '6.*'
- NODE_VERSION: '7.*'
- DOCTOCCHECK: true
- NODE_VERSION: '4.*'
- NODE_VERSION: '6.*'
- NODE_VERSION: '7.*'
- NODE_VERSION: '8.*'

matrix:
include:
env: SHELLCHECK=true
addons:
apt:
sources:
- debian-sid
packages:
- shellcheck

This comment was marked as off-topic.

3 changes: 1 addition & 2 deletions test-build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,7 @@ for version in "${versions[@]}"; do
# Skip "docs" and other non-docker directories
[ -f "$version/Dockerfile" ] || continue

info "### Testing $version ###"
tag=$(cat $version/Dockerfile | grep "ENV NODE_VERSION" | cut -d' ' -f3)
tag=$(grep "ENV NODE_VERSION" "$version/Dockerfile" | cut -d' ' -f3)

info "Building $tag..."

Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.