Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions fixtures/util/override_buildpack/override.yml
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
18 changes: 17 additions & 1 deletion manifest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -56,6 +56,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
Expand Down
6 changes: 3 additions & 3 deletions src/nginx/integration/default_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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")))
Expand All @@ -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")))

Expand Down Expand Up @@ -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.30.x, 1.31.x`))
})
})

Expand Down
Loading