Skip to content

Commit 3f4c594

Browse files
Merge pull request heroku#920 from heroku/edmorley/rm-heroku-16-testing
Drop Heroku-16 from CI test matrix
2 parents 9339e59 + 0272d77 commit 3f4c594

File tree

4 files changed

+8
-19
lines changed

4 files changed

+8
-19
lines changed

.circleci/config.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -62,12 +62,6 @@ workflows:
6262
- unit-test-heroku-build:
6363
name: heroku-18 build tests
6464
stack-number: "18"
65-
- unit-test:
66-
name: heroku-16 unit tests
67-
stack-number: "16"
68-
- unit-test-heroku-build:
69-
name: heroku-16 build tests
70-
stack-number: "16"
7165
- hatchet-test:
7266
name: Hatchet tests
7367
- unit-test-binary:

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# Node.js Buildpack Changelog
22

33
## main
4+
- Drop Heroku-16 from CI test matrix ([#920](https://github.com/heroku/heroku-buildpack-nodejs/pull/920))
45

56
## v184 (2021-05-20)
67
- Prune devDependencies with Yarn 2 ([#891](https://github.com/heroku/heroku-buildpack-nodejs/pull/891))

README.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -111,9 +111,8 @@ make test
111111
Or to just test a specific stack:
112112

113113
```
114-
make heroku-16
115-
make heroku-18
116-
make heroku-20
114+
make heroku-18-build
115+
make heroku-20-build
117116
```
118117

119118
The tests are run via the vendored

makefile

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
test: heroku-20-build heroku-18-build heroku-16-build
1+
test: heroku-20-build heroku-18-build
22

33
build:
44
@GOOS=darwin GOARCH=amd64 go build -ldflags="-s -w" -v -o ./lib/vendor/resolve-version-darwin ./cmd/resolve-version
@@ -31,11 +31,6 @@ heroku-18-build:
3131
@docker run -v $(shell pwd):/buildpack:ro --rm -it -e "STACK=heroku-18-build" heroku/heroku:18-build bash -c 'cp -r /buildpack /buildpack_test; cd /buildpack_test/; test/run;'
3232
@echo ""
3333

34-
heroku-16-build:
35-
@echo "Running tests in docker (heroku-16-build)..."
36-
@docker run -v $(shell pwd):/buildpack:ro --rm -it -e "STACK=heroku-16-build" heroku/heroku:16-build bash -c 'cp -r /buildpack /buildpack_test; cd /buildpack_test/; test/run;'
37-
@echo ""
38-
3934
hatchet:
4035
@echo "Running hatchet integration tests..."
4136
@bash etc/ci-setup.sh
@@ -49,11 +44,11 @@ nodebin-test:
4944
@echo ""
5045

5146
unit:
52-
@echo "Running unit tests in docker (heroku-18)..."
53-
@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/unit;'
47+
@echo "Running unit tests in docker (heroku-20)..."
48+
@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/unit;'
5449
@echo ""
5550

5651
shell:
57-
@echo "Opening heroku-16 shell..."
58-
@docker run -v $(shell pwd):/buildpack:ro --rm -it heroku/heroku:16 bash -c 'cp -r /buildpack /buildpack_test; cd /buildpack_test/; bash'
52+
@echo "Opening heroku-20 shell..."
53+
@docker run -v $(shell pwd):/buildpack:ro --rm -it heroku/heroku:20 bash -c 'cp -r /buildpack /buildpack_test; cd /buildpack_test/; bash'
5954
@echo ""

0 commit comments

Comments
 (0)