Skip to content

Commit

Permalink
Upgrade heroku/procfile to 1.0.1 (#300)
Browse files Browse the repository at this point in the history
* Upgrade heroku/procfile to 1.0.1

* Add Procfile to app-with-compile-error test fixture

Older heroku/procfile versions did not fail detection if there is no Procfile, allowing tests that
explicitly add it to the list of buildpacks to pass even if there is no Procfile. heroku/procfile >= 1.0.0
will fail detection, causing these tests to fail.

To work around this, we add a Procfile to the app-with-compile-error test fixture.
  • Loading branch information
Malax authored May 17, 2022
1 parent 8001254 commit a960268
Show file tree
Hide file tree
Showing 7 changed files with 10 additions and 9 deletions.
1 change: 1 addition & 0 deletions meta-buildpacks/java/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]
* Upgraded `heroku/jvm` to `1.0.0`
* Upgraded `heroku/procfile` to `1.0.1`

## [0.3.16] 2022/03/24
* Upgraded `heroku/jvm` to `0.1.15`
Expand Down
6 changes: 3 additions & 3 deletions meta-buildpacks/java/buildpack.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ api = "0.4"

[buildpack]
id = "heroku/java"
version = "0.3.17"
version = "0.5.0"
name = "Java"
homepage = "https://github.com/heroku/buildpacks-jvm"
description = "Official Heroku buildpack for Java applications."
Expand All @@ -23,7 +23,7 @@ version = "1.0.0"

[[order.group]]
id = "heroku/procfile"
version = "0.6.2"
version = "1.0.1"
optional = true

[[order]]
Expand All @@ -34,7 +34,7 @@ version = "0.0.35"

[[order.group]]
id = "heroku/procfile"
version = "0.6.2"
version = "1.0.1"
optional = true

[metadata]
Expand Down
2 changes: 1 addition & 1 deletion meta-buildpacks/java/package.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ uri = "docker://public.ecr.aws/heroku-buildpacks/heroku-maven-buildpack@sha256:d
uri = "docker://public.ecr.aws/heroku-buildpacks/heroku-gradle-buildpack@sha256:3ee7cce8ba4f2c7496a92aae18a720016a3dccbec44c81e6a68f213a681dabbc"

[[dependencies]]
uri = "docker://docker.io/heroku/procfile-cnb@sha256:b078c148796dd3cff2bb1ac7a0632cf9f4b558bda3161cd0f869010f72c87558"
uri = "docker://docker.io/heroku/procfile-cnb@sha256:79697af377bb9a213a34488253a2ad99e2feb676491bc1f9b6c6fc5418441128"
1 change: 1 addition & 0 deletions test/fixtures/app-with-compile-error/Procfile
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
web: sleep 3600
4 changes: 2 additions & 2 deletions test/meta-buildpacks/java/buildpack.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ version = "1.0.1"

[[order.group]]
id = "heroku/procfile"
version = "0.6.2"
version = "1.0.1"
optional = true

[[order]]
Expand All @@ -28,5 +28,5 @@ version = "0.0.36"

[[order.group]]
id = "heroku/procfile"
version = "0.6.2"
version = "1.0.1"
optional = true
3 changes: 1 addition & 2 deletions test/meta-buildpacks/java/package.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,4 @@ uri = "../../../buildpacks/maven"
uri = "../../../shimmed-buildpacks/gradle"

[[dependencies]]
# Should be urn:cnb:registry:heroku/[email protected] as soon as pack supports it. (0.16.1?)
uri = "docker://docker.io/heroku/procfile-cnb@sha256:b078c148796dd3cff2bb1ac7a0632cf9f4b558bda3161cd0f869010f72c87558"
uri = "docker://docker.io/heroku/procfile-cnb@sha256:79697af377bb9a213a34488253a2ad99e2feb676491bc1f9b6c6fc5418441128"
2 changes: 1 addition & 1 deletion test/specs/maven/spec_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ def root_dir
MAVEN_BUILDPACK = Cutlass::LocalBuildpack.new(directory: root_dir.join("buildpacks/maven"))

Cutlass.config do |config|
config.default_buildpack_paths = [JVM_BUILDPACK, MAVEN_BUILDPACK, "heroku/procfile@0.6.2"]
config.default_buildpack_paths = [JVM_BUILDPACK, MAVEN_BUILDPACK, "heroku/procfile@1.0.1"]
config.default_builder = "heroku/buildpacks:18"
config.default_repo_dirs = [root_dir.join("test/fixtures")]
end
Expand Down

0 comments on commit a960268

Please sign in to comment.