Fix noble integration tests (#1071)

* Fix noble integration tests

* Fix noble integration tests

* Fix include files

* Add LD_LIBRARY_PATH

* Add LD_LIBRARY_PATH

* Drop noble artifacts from buildpack.toml to verify fix

* Drop noble artifacts from buildpack.toml to verify fix

* Adding missing libsqlite3.so

* Adding missing lib

* Updating buildpack.toml with new versions 8.3.30, 8.4.17, 8.4.18, 8.5.2, 8.5.3, 8.3.29

---------

Co-authored-by: paketo-bot <paketobuildpacks@gmail.com>
Co-authored-by: Daniel Mikusa <dan@mikusa.com>

Author: 3 people

buildpack.toml

@@ -118,6 +118,9 @@ def setup_tar
       cp -a -v #{argon_dir}/libargon2.so* #{path}/lib
       cp -a -v /usr/lib/librdkafka.so* #{path}/lib
       cp -a -v ${lib_dir}/libzip.so* #{path}/lib/
+      cp -a -v ${lib_dir}/libsqlite3.so* #{path}/lib/
+      cp -a -v ${lib_dir}/libicu*.so* #{path}/lib/
+      cp -a -v ${lib_dir}/libxml2.so* #{path}/lib/
       cp -a -v ${lib_dir}/libGeoIP.so* #{path}/lib/
       cp -a -v ${lib_dir}/libgpgme.so* #{path}/lib/
       cp -a -v ${lib_dir}/libassuan.so* #{path}/lib/

dependency/actions/compile/binary-builder/cflinuxfs5/recipe/php_recipe.rb

@@ -48,7 +48,7 @@ RUN apt-get update && apt-get install -y \
       libtidy-dev \
       libtool \
       libwebp-dev \
-      libxml2-dev \
+      libxml2 \
       libxml2-dev \
       libxslt1-dev \
       libyaml-dev \

dependency/actions/compile/noble.Dockerfile

@@ -22,7 +22,12 @@ func NewEnvironment() Environment {
 // by the layer path, and the other paths provided as inputs. See PHP documentation
 // for an explanation of the environment variables' significance.
 func (e Environment) Configure(layer packit.Layer, extensionsDir string, defaultIniPath string, iniScanDirs []string) error {
-	layer.SharedEnv.Prepend("PATH", filepath.Join(layer.Path, "sbin"), string(os.PathListSeparator))
+	layer.SharedEnv.Prepend("PATH", strings.Join([]string{filepath.Join(layer.Path, "sbin"), filepath.Join(layer.Path, "bin")}, string(os.PathListSeparator)), string(os.PathListSeparator))
+	layer.SharedEnv.Prepend(
+		"LD_LIBRARY_PATH",
+		strings.Join([]string{filepath.Join(layer.Path, "lib"), filepath.Join(layer.Path, "lib64")}, string(os.PathListSeparator)),
+		string(os.PathListSeparator),
+	)
 	layer.SharedEnv.Default("MIBDIRS", filepath.Join(layer.Path, "mibs"))
 
 	layer.SharedEnv.Default("PHP_HOME", layer.Path)

environment.go

@@ -47,9 +47,11 @@ func testEnvironment(t *testing.T, context spec.G, it spec.S) {
 			Expect(err).NotTo(HaveOccurred())
 
 			Expect(layer.SharedEnv).To(Equal(packit.Environment{
+				"LD_LIBRARY_PATH.delim":     ":",
+				"LD_LIBRARY_PATH.prepend":   filepath.Join(layer.Path, "lib") + ":" + filepath.Join(layer.Path, "lib64"),
 				"MIBDIRS.default":           filepath.Join(layer.Path, "mibs"),
 				"PATH.delim":                ":",
-				"PATH.prepend":              filepath.Join(layer.Path, "sbin"),
+				"PATH.prepend":              filepath.Join(layer.Path, "sbin") + ":" + filepath.Join(layer.Path, "bin"),
 				"PHP_API.default":           "20200717",
 				"PHP_EXTENSION_DIR.default": "directory/extensions/no-debug-non-zts-20200717",
 				"PHP_HOME.default":          layer.Path,
@@ -72,9 +74,11 @@ func testEnvironment(t *testing.T, context spec.G, it spec.S) {
 				Expect(err).NotTo(HaveOccurred())
 
 				Expect(layer.SharedEnv).To(Equal(packit.Environment{
+					"LD_LIBRARY_PATH.delim":     ":",
+					"LD_LIBRARY_PATH.prepend":   filepath.Join(layer.Path, "lib") + ":" + filepath.Join(layer.Path, "lib64"),
 					"MIBDIRS.default":           filepath.Join(layer.Path, "mibs"),
 					"PATH.delim":                ":",
-					"PATH.prepend":              filepath.Join(layer.Path, "sbin"),
+					"PATH.prepend":              filepath.Join(layer.Path, "sbin") + ":" + filepath.Join(layer.Path, "bin"),
 					"PHP_API.default":           "20200717",
 					"PHP_EXTENSION_DIR.default": "directory/extensions/no-debug-non-zts-20200717",
 					"PHP_HOME.default":          layer.Path,

environment_test.go

@@ -1,6 +1,7 @@
 {
-  "build-plan": "github.com/paketo-community/build-plan",
   "builders": [
-    "index.docker.io/paketobuildpacks/builder-jammy-buildpackless-full:latest"
-  ]
+    "index.docker.io/paketobuildpacks/builder-jammy-buildpackless-full:latest",
+    "index.docker.io/paketobuildpacks/ubuntu-noble-builder-buildpackless:latest"
+  ],
+  "build-plan": "index.docker.io/paketocommunity/build-plan"
 }