From 8282d3ce4a2d6896006a2f9e827e0847af8ea888 Mon Sep 17 00:00:00 2001 From: ARI WG Git Bot Date: Mon, 29 Jun 2026 12:43:11 +0000 Subject: [PATCH 1/5] Add nginx 1.31.2 for stack(s) cflinuxfs4, cflinuxfs5 --- manifest.yml | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/manifest.yml b/manifest.yml index 10c7fd9b..322e8050 100644 --- a/manifest.yml +++ b/manifest.yml @@ -4,7 +4,7 @@ default_versions: - name: nginx version: 1.29.x version_lines: - mainline: 1.29.x + mainline: 1.31.x stable: 1.30.x dependency_deprecation_dates: dependencies: @@ -24,14 +24,6 @@ dependencies: - cflinuxfs3 source: http://nginx.org/download/nginx-1.27.5.tar.gz source_sha256: e96acebb9c2a6db8a000c3dd1b32ecba1b810f0cd586232d4d921e376674dd0e -- name: nginx - version: 1.29.7 - uri: https://buildpacks.cloudfoundry.org/dependencies/nginx/nginx_1.29.7_linux_x64_cflinuxfs4_b35ad5a9.tgz - sha256: b35ad5a9b15302e396c3581070c7707ad0534ee99db91d133a6bd100044a2c25 - cf_stacks: - - cflinuxfs4 - source: http://nginx.org/download/nginx-1.29.7.tar.gz - source_sha256: 673f8fb8c0961c44fbd9410d6161831453609b44063d3f2948253fc2b5692139 - name: nginx version: 1.29.7 uri: https://buildpacks.cloudfoundry.org/dependencies/nginx/nginx_1.29.7_linux_x64_cflinuxfs5_7fc38247.tgz @@ -56,6 +48,22 @@ dependencies: - cflinuxfs5 source: http://nginx.org/download/nginx-1.30.3.tar.gz source_sha256: e5823dc6f45610993def93ebf6cfce68264af4958c77e874b7d20f3709001b8f +- name: nginx + version: 1.31.2 + uri: https://buildpacks.cloudfoundry.org/dependencies/nginx/nginx_1.31.2_linux_x64_cflinuxfs4_b837d5de.tgz + sha256: b837d5de6e64178355e42ab6f7a6a5fdd0c61ce146780e3bd0da9ee93c4011fa + cf_stacks: + - cflinuxfs4 + source: http://nginx.org/download/nginx-1.31.2.tar.gz + source_sha256: af2a957c41da636ddc4f883e4523c6d140b4784dbce42000c364ae5092aa473c +- name: nginx + version: 1.31.2 + uri: https://buildpacks.cloudfoundry.org/dependencies/nginx/nginx_1.31.2_linux_x64_cflinuxfs5_9ecc8fa6.tgz + sha256: 9ecc8fa62fb89b52b4057e95ad383dd29ced8a188241e71efa2fb295c28f5efd + cf_stacks: + - cflinuxfs5 + source: http://nginx.org/download/nginx-1.31.2.tar.gz + source_sha256: af2a957c41da636ddc4f883e4523c6d140b4784dbce42000c364ae5092aa473c - name: openresty version: 1.21.4.4 uri: https://buildpacks.cloudfoundry.org/dependencies/openresty/openresty_1.21.4.4_linux_x64_cflinuxfs3_9ade85e8.tgz From 9e68b444bd301e1987af4fac522173a95e02010d Mon Sep 17 00:00:00 2001 From: Tsvetelina Marinova Date: Mon, 29 Jun 2026 16:38:20 +0300 Subject: [PATCH 2/5] Add nginx v1.31.x line to default_test.go --- src/nginx/integration/default_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/nginx/integration/default_test.go b/src/nginx/integration/default_test.go index 78860ff9..62ad7149 100644 --- a/src/nginx/integration/default_test.go +++ b/src/nginx/integration/default_test.go @@ -170,7 +170,7 @@ func testDefault(platform switchblade.Platform, fixtures string) func(*testing.T Execute(name, filepath.Join(fixtures, "default", "unavailable_version")) Expect(err).To(HaveOccurred()) - Eventually(logs).Should(ContainSubstring(`Available versions: mainline, stable, 1.29.x, 1.30.x`)) + Eventually(logs).Should(ContainSubstring(`Available versions: mainline, stable, 1.29.x, 1.30.x, 1.31.x`)) }) }) From 182403b1381c517deff05a981681785430bcf5b9 Mon Sep 17 00:00:00 2001 From: Tsvetelina Marinova Date: Mon, 29 Jun 2026 17:02:12 +0300 Subject: [PATCH 3/5] Update default_test.go --- src/nginx/integration/default_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/nginx/integration/default_test.go b/src/nginx/integration/default_test.go index 62ad7149..ac1a8a0d 100644 --- a/src/nginx/integration/default_test.go +++ b/src/nginx/integration/default_test.go @@ -114,7 +114,7 @@ func testDefault(platform switchblade.Platform, fixtures string) func(*testing.T Execute(name, filepath.Join(fixtures, "default", "unspecified_version")) Expect(err).NotTo(HaveOccurred()) - Eventually(logs).Should(ContainSubstring(`No nginx version specified - using mainline => 1.29.`)) + Eventually(logs).Should(ContainSubstring(`No nginx version specified - using mainline => 1.31.`)) Eventually(logs).ShouldNot(ContainSubstring(`Requested nginx version:`)) Eventually(deployment).Should(Serve(ContainSubstring("Exciting Content"))) @@ -133,7 +133,7 @@ func testDefault(platform switchblade.Platform, fixtures string) func(*testing.T Execute(name, filepath.Join(fixtures, "default", "mainline")) Expect(err).NotTo(HaveOccurred()) - Eventually(logs).Should(ContainSubstring(`Requested nginx version: mainline => 1.29.`)) + Eventually(logs).Should(ContainSubstring(`Requested nginx version: mainline => 1.31.`)) Eventually(deployment).Should(Serve(ContainSubstring("Exciting Content"))) From 95ae61d6e6c883695c0d132b9386a9df9295f266 Mon Sep 17 00:00:00 2001 From: Tsvetelina Marinova Date: Mon, 29 Jun 2026 17:21:22 +0300 Subject: [PATCH 4/5] Update default_test.go --- src/nginx/integration/default_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/nginx/integration/default_test.go b/src/nginx/integration/default_test.go index ac1a8a0d..aa1cc976 100644 --- a/src/nginx/integration/default_test.go +++ b/src/nginx/integration/default_test.go @@ -170,7 +170,7 @@ func testDefault(platform switchblade.Platform, fixtures string) func(*testing.T Execute(name, filepath.Join(fixtures, "default", "unavailable_version")) Expect(err).To(HaveOccurred()) - Eventually(logs).Should(ContainSubstring(`Available versions: mainline, stable, 1.29.x, 1.30.x, 1.31.x`)) + Eventually(logs).Should(ContainSubstring(`Available versions: mainline, stable, 1.30.x, 1.31.x`)) }) }) From d5c0c4b6630281bd0b3c7a25a545b52b34022e17 Mon Sep 17 00:00:00 2001 From: Tsvetelina Marinova Date: Mon, 29 Jun 2026 17:32:57 +0300 Subject: [PATCH 5/5] Update fixture override.yml --- fixtures/util/override_buildpack/override.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fixtures/util/override_buildpack/override.yml b/fixtures/util/override_buildpack/override.yml index 5559bdf9..d3be3719 100644 --- a/fixtures/util/override_buildpack/override.yml +++ b/fixtures/util/override_buildpack/override.yml @@ -1,10 +1,10 @@ version_lines: - mainline: 1.29.999 + mainline: 1.31.999 nginx: dependencies: - name: nginx - version: 1.29.999 - uri: https://buildpacks.cloudfoundry.org/dependencies/nginx/nginx-1.29.999-linux-x64.tgz + version: 1.31.999 + uri: https://buildpacks.cloudfoundry.org/dependencies/nginx/nginx-1.31.999-linux-x64.tgz file: BUILDPACK_DIR/nginx.tgz sha256: 062d906c87839d03b243e2821e10653c89b4c92878bfe2bf995dec231e117bfc cf_stacks: