From c62d0836e5849f953bc3f9e9612e0c72a02590ca Mon Sep 17 00:00:00 2001 From: Manuel Fuchs Date: Wed, 7 Feb 2024 12:18:25 +0100 Subject: [PATCH] Update test and example buildpacks --- examples/basics/buildpack.toml | 5 +---- examples/basics/src/main.rs | 8 ++++++-- examples/execd/buildpack.toml | 5 +---- .../buildpacks/not_libcnb/buildpack.toml | 3 --- .../multiple_buildpacks/buildpacks/one/buildpack.toml | 3 --- .../multiple_buildpacks/buildpacks/two/buildpack.toml | 3 --- .../tests/fixtures/single_buildpack/buildpack.toml | 3 --- .../fixtures/buildpacks/compile-error/buildpack.toml | 3 --- .../tests/fixtures/buildpacks/component-a/buildpack.toml | 3 --- .../tests/fixtures/buildpacks/component-b/buildpack.toml | 3 --- .../fixtures/buildpacks/invalid-cargo-toml/buildpack.toml | 3 --- test-buildpacks/readonly-layer-files/buildpack.toml | 5 +---- test-buildpacks/sbom/buildpack.toml | 5 +---- test-buildpacks/store/buildpack.toml | 5 +---- test-buildpacks/tracing/buildpack.toml | 5 +---- .../fixtures/buildpacks/tracing-reader/buildpack.toml | 5 +---- 16 files changed, 13 insertions(+), 54 deletions(-) diff --git a/examples/basics/buildpack.toml b/examples/basics/buildpack.toml index 542775d9..88ab3b18 100644 --- a/examples/basics/buildpack.toml +++ b/examples/basics/buildpack.toml @@ -1,9 +1,6 @@ -api = "0.9" +api = "0.10" [buildpack] id = "libcnb-examples/basics" version = "0.1.0" name = "Example libcnb buildpack: basics" - -[[stacks]] -id = "*" diff --git a/examples/basics/src/main.rs b/examples/basics/src/main.rs index 72716d9a..b6d99a16 100644 --- a/examples/basics/src/main.rs +++ b/examples/basics/src/main.rs @@ -14,8 +14,12 @@ impl Buildpack for BasicBuildpack { DetectResultBuilder::pass().build() } - fn build(&self, _context: BuildContext) -> libcnb::Result { - // println!("Build runs on stack {}!", context.stack_id); + fn build(&self, context: BuildContext) -> libcnb::Result { + println!( + "Build runs on: {} ({})!", + context.target_os, context.target_arch + ); + BuildResultBuilder::new().build() } } diff --git a/examples/execd/buildpack.toml b/examples/execd/buildpack.toml index 8300fc51..7e041601 100644 --- a/examples/execd/buildpack.toml +++ b/examples/execd/buildpack.toml @@ -1,9 +1,6 @@ -api = "0.9" +api = "0.10" [buildpack] id = "libcnb-examples/execd" version = "0.1.0" name = "Example libcnb buildpack: execd" - -[[stacks]] -id = "*" diff --git a/libcnb-cargo/tests/fixtures/multiple_buildpacks/buildpacks/not_libcnb/buildpack.toml b/libcnb-cargo/tests/fixtures/multiple_buildpacks/buildpacks/not_libcnb/buildpack.toml index 2e50669f..b46e7d98 100644 --- a/libcnb-cargo/tests/fixtures/multiple_buildpacks/buildpacks/not_libcnb/buildpack.toml +++ b/libcnb-cargo/tests/fixtures/multiple_buildpacks/buildpacks/not_libcnb/buildpack.toml @@ -3,6 +3,3 @@ api = "0.8" [buildpack] id = "multiple-buildpacks/not-libcnb" version = "0.0.0" - -[[stacks]] -id = "some-stack" diff --git a/libcnb-cargo/tests/fixtures/multiple_buildpacks/buildpacks/one/buildpack.toml b/libcnb-cargo/tests/fixtures/multiple_buildpacks/buildpacks/one/buildpack.toml index ede40ad4..d5333dd8 100644 --- a/libcnb-cargo/tests/fixtures/multiple_buildpacks/buildpacks/one/buildpack.toml +++ b/libcnb-cargo/tests/fixtures/multiple_buildpacks/buildpacks/one/buildpack.toml @@ -3,6 +3,3 @@ api = "0.8" [buildpack] id = "multiple-buildpacks/one" version = "0.0.0" - -[[stacks]] -id = "some-stack" diff --git a/libcnb-cargo/tests/fixtures/multiple_buildpacks/buildpacks/two/buildpack.toml b/libcnb-cargo/tests/fixtures/multiple_buildpacks/buildpacks/two/buildpack.toml index e9c05496..3bdd2a87 100644 --- a/libcnb-cargo/tests/fixtures/multiple_buildpacks/buildpacks/two/buildpack.toml +++ b/libcnb-cargo/tests/fixtures/multiple_buildpacks/buildpacks/two/buildpack.toml @@ -3,6 +3,3 @@ api = "0.8" [buildpack] id = "multiple-buildpacks/two" version = "0.0.0" - -[[stacks]] -id = "some-stack" diff --git a/libcnb-cargo/tests/fixtures/single_buildpack/buildpack.toml b/libcnb-cargo/tests/fixtures/single_buildpack/buildpack.toml index 89ab4c57..46e199dc 100644 --- a/libcnb-cargo/tests/fixtures/single_buildpack/buildpack.toml +++ b/libcnb-cargo/tests/fixtures/single_buildpack/buildpack.toml @@ -3,6 +3,3 @@ api = "0.10" [buildpack] id = "single-buildpack" version = "0.0.0" - -[[stacks]] -id = "some-stack" diff --git a/libcnb-test/tests/fixtures/buildpacks/compile-error/buildpack.toml b/libcnb-test/tests/fixtures/buildpacks/compile-error/buildpack.toml index ec475691..71603a19 100644 --- a/libcnb-test/tests/fixtures/buildpacks/compile-error/buildpack.toml +++ b/libcnb-test/tests/fixtures/buildpacks/compile-error/buildpack.toml @@ -3,6 +3,3 @@ api = "0.8" [buildpack] id = "libcnb-test/compile-error" version = "0.0.0" - -[[stacks]] -id = "*" diff --git a/libcnb-test/tests/fixtures/buildpacks/component-a/buildpack.toml b/libcnb-test/tests/fixtures/buildpacks/component-a/buildpack.toml index f2e10539..969e1e36 100644 --- a/libcnb-test/tests/fixtures/buildpacks/component-a/buildpack.toml +++ b/libcnb-test/tests/fixtures/buildpacks/component-a/buildpack.toml @@ -3,6 +3,3 @@ api = "0.8" [buildpack] id = "libcnb-test/a" version = "0.0.0" - -[[stacks]] -id = "*" diff --git a/libcnb-test/tests/fixtures/buildpacks/component-b/buildpack.toml b/libcnb-test/tests/fixtures/buildpacks/component-b/buildpack.toml index fd1940bf..1e16ebb4 100644 --- a/libcnb-test/tests/fixtures/buildpacks/component-b/buildpack.toml +++ b/libcnb-test/tests/fixtures/buildpacks/component-b/buildpack.toml @@ -3,6 +3,3 @@ api = "0.8" [buildpack] id = "libcnb-test/b" version = "0.0.0" - -[[stacks]] -id = "*" diff --git a/libcnb-test/tests/fixtures/buildpacks/invalid-cargo-toml/buildpack.toml b/libcnb-test/tests/fixtures/buildpacks/invalid-cargo-toml/buildpack.toml index 3fec6b1e..0e78fa15 100644 --- a/libcnb-test/tests/fixtures/buildpacks/invalid-cargo-toml/buildpack.toml +++ b/libcnb-test/tests/fixtures/buildpacks/invalid-cargo-toml/buildpack.toml @@ -3,6 +3,3 @@ api = "0.8" [buildpack] id = "libcnb-test/invalid-cargo-toml" version = "0.0.0" - -[[stacks]] -id = "*" diff --git a/test-buildpacks/readonly-layer-files/buildpack.toml b/test-buildpacks/readonly-layer-files/buildpack.toml index ae677edc..19af6a2c 100644 --- a/test-buildpacks/readonly-layer-files/buildpack.toml +++ b/test-buildpacks/readonly-layer-files/buildpack.toml @@ -1,9 +1,6 @@ -api = "0.9" +api = "0.10" [buildpack] id = "libcnb-test-buildpacks/readonly-layer-files" version = "0.1.0" name = "libcnb test buildpack: readonly-layer-files" - -[[stacks]] -id = "*" diff --git a/test-buildpacks/sbom/buildpack.toml b/test-buildpacks/sbom/buildpack.toml index 11098c5e..0906bf46 100644 --- a/test-buildpacks/sbom/buildpack.toml +++ b/test-buildpacks/sbom/buildpack.toml @@ -1,10 +1,7 @@ -api = "0.9" +api = "0.10" [buildpack] id = "libcnb-test-buildpacks/sbom" version = "0.1.0" name = "libcnb test buildpack: SBOM" sbom-formats = ["application/vnd.cyclonedx+json", "application/spdx+json", "application/vnd.syft+json"] - -[[stacks]] -id = "*" diff --git a/test-buildpacks/store/buildpack.toml b/test-buildpacks/store/buildpack.toml index cd4d7d34..0625d567 100644 --- a/test-buildpacks/store/buildpack.toml +++ b/test-buildpacks/store/buildpack.toml @@ -1,9 +1,6 @@ -api = "0.9" +api = "0.10" [buildpack] id = "libcnb-test-buildpacks/store" version = "0.1.0" name = "libcnb test buildpack: store" - -[[stacks]] -id = "*" diff --git a/test-buildpacks/tracing/buildpack.toml b/test-buildpacks/tracing/buildpack.toml index 3820284a..544691d4 100644 --- a/test-buildpacks/tracing/buildpack.toml +++ b/test-buildpacks/tracing/buildpack.toml @@ -1,9 +1,6 @@ -api = "0.9" +api = "0.10" [buildpack] id = "libcnb-test-buildpacks/tracing" version = "0.1.0" name = "libcnb test buildpack: tracing" - -[[stacks]] -id = "*" diff --git a/test-buildpacks/tracing/tests/fixtures/buildpacks/tracing-reader/buildpack.toml b/test-buildpacks/tracing/tests/fixtures/buildpacks/tracing-reader/buildpack.toml index 3b35a264..e2a8eafa 100644 --- a/test-buildpacks/tracing/tests/fixtures/buildpacks/tracing-reader/buildpack.toml +++ b/test-buildpacks/tracing/tests/fixtures/buildpacks/tracing-reader/buildpack.toml @@ -1,9 +1,6 @@ -api = "0.9" +api = "0.10" [buildpack] id = "libcnb-test-buildpacks/tracing-reader" version = "0.1.0" name = "libcnb test buildpack fixture: tracing-reader" - -[[stacks]] -id = "*"