Skip to content

Commit

Permalink
Merge pull request #763 from heroku/edmorley-heroku-20-travis
Browse files Browse the repository at this point in the history
Add Heroku-20 to the Travis test matrix
  • Loading branch information
edmorley authored Apr 22, 2020
2 parents 08e52c2 + d5af35e commit c979ecd
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 4 deletions.
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ services:
- docker
env:
- TEST=shellcheck
- TEST=heroku-20 STACK=heroku-20
- TEST=heroku-18 STACK=heroku-18
- TEST=heroku-16 STACK=heroku-16
- TEST=cedar-14 STACK=cedar-14
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

## master
- Update Travis badge to `master` and other changes in README ([#753](https://github.com/heroku/heroku-buildpack-nodejs/pull/753))
- Add Heroku-20 to the Travis test matrix ([#763](https://github.com/heroku/heroku-buildpack-nodejs/pull/763))

## v170 (2020-03-31)
- Bump rake from 12.3.1 to 12.3.3 ([#742](https://github.com/heroku/heroku-buildpack-nodejs/pull/742))
Expand Down
7 changes: 4 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ heroku buildpacks:set <your-github-url>#your-branch
## Tests

The buildpack tests use [Docker](https://www.docker.com/) to simulate
Heroku's Heroku-16 and Heroku-18 containers.
Heroku's stacks.

To run the test suite:

Expand All @@ -88,8 +88,9 @@ make test
Or to just test a specific stack:

```
make test-heroku-16
make test-heroku-18
make heroku-16
make heroku-18
make heroku-20
```

The tests are run via the vendored
Expand Down
7 changes: 6 additions & 1 deletion makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
test: heroku-18 heroku-16 cedar-14
test: heroku-20 heroku-18 heroku-16 cedar-14

build:
@GOOS=darwin GOARCH=amd64 go build -ldflags="-s -w" -v -o ./lib/vendor/resolve-version-darwin ./cmd/resolve-version
Expand All @@ -21,6 +21,11 @@ shellcheck:
@shellcheck -x ci-profile/**
@shellcheck -x etc/**

heroku-20:
@echo "Running tests in docker (heroku-20)..."
@docker run -v $(shell pwd):/buildpack:ro --rm -it -e "STACK=heroku-20" heroku/heroku:20 bash -c 'cp -r /buildpack /buildpack_test; cd /buildpack_test/; test/run;'
@echo ""

heroku-18:
@echo "Running tests in docker (heroku-18)..."
@docker run -v $(shell pwd):/buildpack:ro --rm -it -e "STACK=heroku-18" heroku/heroku:18 bash -c 'cp -r /buildpack /buildpack_test; cd /buildpack_test/; test/run;'
Expand Down

0 comments on commit c979ecd

Please sign in to comment.