Skip to content

Commit 307a2e5

Browse files
authored
Merge pull request #2 from heroku/malax/meta-bp-cleanup
Fix minor issues with meta buildpack
2 parents 2f3ff33 + 88119b6 commit 307a2e5

File tree

4 files changed

+30
-7
lines changed

4 files changed

+30
-7
lines changed

.circleci/config.yml

+21-3
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,32 @@ jobs:
1313
steps:
1414
- checkout
1515
- setup_remote_docker
16-
- pack/install-pack
16+
- pack/install-pack:
17+
version: 0.16.0
1718
- run: pack package-buildpack test --config << parameters.package-toml >>
1819

20+
shell-linting:
21+
docker:
22+
- image: koalaman/shellcheck-alpine:v0.7.1
23+
steps:
24+
- run: "apk add git"
25+
# shfmt is currently (Jan 2021) only available in the edge community repository.
26+
- run: "apk add shfmt --repository=http://dl-3.alpinelinux.org/alpine/edge/community"
27+
- checkout
28+
- run:
29+
name: "shellcheck"
30+
command: "shfmt -f . | grep -v ^test/ | xargs shellcheck"
31+
- run:
32+
name: "shfmt"
33+
command: "shfmt -f . | grep -v ^test/ | xargs shfmt -d"
34+
1935
workflows:
2036
version: 2
21-
package:
37+
ci:
2238
jobs:
39+
- shell-linting
2340
- package-buildpack:
2441
matrix:
2542
parameters:
26-
package-toml: [ "meta-buildpacks/nodejs/package.toml" ]
43+
package-toml:
44+
- "meta-buildpacks/nodejs/package.toml"

meta-buildpacks/nodejs/CHANGELOG.md

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
## main
22

3+
# 0.1.1
34
* Initial release

meta-buildpacks/nodejs/buildpack.toml

+6-3
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ api = "0.2"
22

33
[buildpack]
44
id = "heroku/nodejs"
5-
version = "0.1"
5+
version = "0.1.1"
66
name = "Node.js"
77

88
[[order]]
@@ -21,7 +21,7 @@ optional = true
2121

2222
[[order.group]]
2323
id = "heroku/procfile"
24-
version = "0.6"
24+
version = "0.6.1"
2525
optional = true
2626

2727
[[order]]
@@ -40,5 +40,8 @@ optional = true
4040

4141
[[order.group]]
4242
id = "heroku/procfile"
43-
version = "0.6"
43+
version = "0.6.1"
4444
optional = true
45+
46+
[metadata.release.docker]
47+
repository="public.ecr.aws/r2f9u0w4/heroku-nodejs-buildpack"

meta-buildpacks/nodejs/package.toml

+2-1
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,5 @@ uri = "https://github.com/heroku/nodejs-typescript-buildpack/releases/download/v
1414
uri = "https://github.com/heroku/nodejs-npm-buildpack/releases/download/v0.4.0/nodejs-npm-buildpack-v0.4.0.tgz"
1515

1616
[[dependencies]]
17-
uri = "https://github.com/heroku/procfile-cnb/releases/download/v0.6/procfile-cnb-v0.6.tgz"
17+
# Should be urn:cnb:registry:heroku/[email protected] as soon as pack supports it. (0.16.1?)
18+
uri = "docker://docker.io/heroku/procfile-cnb@sha256:74881b33e1e33eea38b419e667b0a99ac50e536727eeefd1b2eeb7ff3a937ffd"

0 commit comments

Comments
 (0)