-
Notifications
You must be signed in to change notification settings - Fork 286
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* Use constants for assumed and default lifecycle descriptor fields
* Fix implementation of `api.Version#SupportsVersion` * Remove AdditionalBuildpack wrapper Signed-off-by: Javier Romero <[email protected]> Signed-off-by: Andrew Meyer <[email protected]>
- Loading branch information
Showing
17 changed files
with
198 additions
and
248 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -600,51 +600,6 @@ func testBuild(t *testing.T, when spec.G, it spec.S) { | |
h.AssertNil(t, os.Remove(buildpackTgz)) | ||
}) | ||
|
||
when("buildpack is an older api version", func() { | ||
var ( | ||
incompatibleBuildpackTGZ *os.File | ||
err error | ||
) | ||
|
||
it.Before(func() { | ||
incompatibleBuildpackTGZ, err = ifakes.CreateBuildpackTGZ(tmpDir, builder.BuildpackDescriptor{ | ||
API: api.MustParse("0.9"), | ||
Info: builder.BuildpackInfo{ | ||
ID: "incompatible.id", | ||
Version: "incompatible.id.version", | ||
}, | ||
Stacks: []builder.Stack{ | ||
{ | ||
ID: "some.stack.id", | ||
}, | ||
}, | ||
Order: nil, | ||
}) | ||
|
||
h.AssertNil(t, err) | ||
}) | ||
|
||
it("should error", func() { | ||
err := subject.Build(context.TODO(), BuildOptions{ | ||
Image: "some/app", | ||
Builder: builderName, | ||
ClearCache: true, | ||
Buildpacks: []string{ | ||
"[email protected]", | ||
incompatibleBuildpackTGZ.Name(), | ||
}, | ||
}) | ||
|
||
h.AssertError(t, err, fmt.Sprintf( | ||
"buildpack from URI '%s' (Buildpack API version %s) is incompatible with lifecycle '%s' (Buildpack API version %s)", | ||
incompatibleBuildpackTGZ.Name(), | ||
"0.9", | ||
"0.3.0", | ||
"0.3", | ||
)) | ||
}) | ||
}) | ||
|
||
when("is windows", func() { | ||
it.Before(func() { | ||
h.SkipIf(t, runtime.GOOS != "windows", "Skipped on non-windows") | ||
|
Oops, something went wrong.