Skip to content

Commit 9b9c5ce

Browse files
committed
Add cflinuxfs5 support: merge dependency updates and update defaults
Consolidate open dependency PRs (#879-#884, #887) to add cflinuxfs5 stack support for the next buildpack release: - Add node 20.20.0 and 22.22.0 for cflinuxfs5 stack - Update node 20.20.0, 22.22.0, 24.13.0 cflinuxfs4 hashes - Fix node 22.22.0 source URL to point to correct version - Add python 3.12.9, 3.13.9, 3.14.3 for cflinuxfs4 and cflinuxfs5 - Add deprecation dates for python 3.12.x, 3.13.x, 3.14.x - Update yarn 1.22.22 to replace cflinuxfs3 with cflinuxfs5 - Change default python from 3.11.x to 3.13.x (3.11 not yet built for cflinuxfs5) - Update integration test default stack from cflinuxfs3 to cflinuxfs4 Known gaps (to be addressed when dependencies are built): - node 24.13.0 cflinuxfs5 (not yet available) - python 3.11.14 cflinuxfs5 (not yet available)
1 parent 8755b37 commit 9b9c5ce

2 files changed

Lines changed: 89 additions & 13 deletions

File tree

manifest.yml

Lines changed: 88 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ default_versions:
44
- name: node
55
version: 22.x
66
- name: python
7-
version: 3.11.x
7+
version: 3.13.x
88
include_files:
99
- CHANGELOG
1010
- CONTRIBUTING.md
@@ -40,6 +40,18 @@ dependency_deprecation_dates:
4040
name: python
4141
date: 2027-10-24
4242
link: https://www.python.org/dev/peps/pep-0664/
43+
- version_line: 3.12.x
44+
name: python
45+
date: 2028-10-02
46+
link: https://www.python.org/dev/peps/pep-0693/
47+
- version_line: 3.13.x
48+
name: python
49+
date: 2029-10-07
50+
link: https://peps.python.org/pep-0719/
51+
- version_line: 3.14.x
52+
name: python
53+
date: 2030-10-07
54+
link: https://peps.python.org/pep-0745/
4355
dependencies:
4456
- name: node
4557
version: 20.19.3
@@ -67,24 +79,40 @@ dependencies:
6779
source_sha256: b34d3f57666d91deb6a148b604d7f2f4051d540087e9f6c627dedc1fcb866d5a
6880
- name: node
6981
version: 20.20.0
70-
uri: https://buildpacks.cloudfoundry.org/dependencies/node/node_20.20.0_linux_x64_cflinuxfs4_0eeb6a6f.tgz
71-
sha256: 0eeb6a6fc35674aaebb85e2cf8f94832d76a1d86bc48fb39da5a577d44772216
82+
uri: https://buildpacks.cloudfoundry.org/dependencies/node/node_20.20.0_linux_x64_cflinuxfs4_a02ef5d7.tgz
83+
sha256: a02ef5d7adba63111d4d2a27c05880420d392e1dc0e0f115e32d9e8375138c67
7284
cf_stacks:
7385
- cflinuxfs4
7486
source: https://nodejs.org/dist/v20.20.0/node-v20.20.0.tar.gz
7587
source_sha256: cafc92e90917c17869d982fdff10104c2eb328437ed9bbf03fdda78ebc0accdd
88+
- name: node
89+
version: 20.20.0
90+
uri: https://buildpacks.cloudfoundry.org/dependencies/node/node_20.20.0_linux_x64_cflinuxfs5_145a0640.tgz
91+
sha256: 145a0640dc04cddb0a5350479217277f15837d58d9d32bcb5b8393bfc5f8d739
92+
cf_stacks:
93+
- cflinuxfs5
94+
source: https://nodejs.org/dist/v20.20.0/node-v20.20.0.tar.gz
95+
source_sha256: cafc92e90917c17869d982fdff10104c2eb328437ed9bbf03fdda78ebc0accdd
7696
- name: node
7797
version: 22.22.0
78-
uri: https://buildpacks.cloudfoundry.org/dependencies/node/node_22.22.0_linux_x64_cflinuxfs4_a73ffe6d.tgz
79-
sha256: a73ffe6db22c172c7d29372a9b3dc964d5ea058100e7bb9b89406879a2d38862
98+
uri: https://buildpacks.cloudfoundry.org/dependencies/node/node_22.22.0_linux_x64_cflinuxfs4_050e29db.tgz
99+
sha256: 050e29dbf3566bcf8a777b68bc0dbf168af5051aa6db897f6c2870a926f40c7c
80100
cf_stacks:
81101
- cflinuxfs4
82-
source: https://github.com/nodejs/node/archive/v22.20.0.tar.gz
83-
source_sha256: 5c2e4ecc6583c5d49f9a9a4473fc267402762fc8e8a7835465919dacd6fdd5d8
102+
source: https://nodejs.org/dist/v22.22.0/node-v22.22.0.tar.gz
103+
source_sha256: 5a4585d7f26bfb283267194b299243efea5ee6edd2fbf887825469b4ac94aece
104+
- name: node
105+
version: 22.22.0
106+
uri: https://buildpacks.cloudfoundry.org/dependencies/node/node_22.22.0_linux_x64_cflinuxfs5_5a0ba3c8.tgz
107+
sha256: 5a0ba3c87ab6e7f883bfbc0c277761a11c15c1f5ff3667f0cd86ec3be869182c
108+
cf_stacks:
109+
- cflinuxfs5
110+
source: https://nodejs.org/dist/v22.22.0/node-v22.22.0.tar.gz
111+
source_sha256: 5a4585d7f26bfb283267194b299243efea5ee6edd2fbf887825469b4ac94aece
84112
- name: node
85113
version: 24.13.0
86-
uri: https://buildpacks.cloudfoundry.org/dependencies/node/node_24.13.0_linux_x64_cflinuxfs4_a816dee1.tgz
87-
sha256: a816dee19024ef9a2e4d87e7cf6e826abec243262fa8050f9250892a8c29e988
114+
uri: https://buildpacks.cloudfoundry.org/dependencies/node/node_24.13.0_linux_x64_cflinuxfs4_add175c5.tgz
115+
sha256: add175c54500abfb8a125b2893f10eb535f4c1e224d29c71ad5a8355f480b081
88116
cf_stacks:
89117
- cflinuxfs4
90118
source: https://nodejs.org/dist/v24.13.0/node-v24.13.0.tar.gz
@@ -105,13 +133,61 @@ dependencies:
105133
- cflinuxfs4
106134
source: https://www.python.org/ftp/python/3.11.14/Python-3.11.14.tgz
107135
source_sha256: 563d2a1b2a5ba5d5409b5ecd05a0e1bf9b028cf3e6a6f0c87a5dc8dc3f2d9182
136+
- name: python
137+
version: 3.12.9
138+
uri: https://buildpacks.cloudfoundry.org/dependencies/python/python_3.12.9_linux_x64_cflinuxfs4_77f9cf49.tgz
139+
sha256: 77f9cf49eb3a948e74a8bed755af6a7d992850142266a0cb2825bebb3c14d6b0
140+
cf_stacks:
141+
- cflinuxfs4
142+
source: https://www.python.org/ftp/python/3.12.9/Python-3.12.9.tgz
143+
source_sha256: 45313e4c5f0e8acdec9580161d565cf5fea578e3eabf25df7cc6355bf4afa1ee
144+
- name: python
145+
version: 3.12.9
146+
uri: https://buildpacks.cloudfoundry.org/dependencies/python/python_3.12.9_linux_x64_cflinuxfs5_b173ddfd.tgz
147+
sha256: b173ddfd9ac7d274dfb003446e4975e632bc4f262ef40f6caa2bbb53eb818820
148+
cf_stacks:
149+
- cflinuxfs5
150+
source: https://www.python.org/ftp/python/3.12.9/Python-3.12.9.tgz
151+
source_sha256: 45313e4c5f0e8acdec9580161d565cf5fea578e3eabf25df7cc6355bf4afa1ee
152+
- name: python
153+
version: 3.13.9
154+
uri: https://buildpacks.cloudfoundry.org/dependencies/python/python_3.13.9_linux_x64_cflinuxfs4_ec0866a7.tgz
155+
sha256: ec0866a7a9483e12724a995d554ee898d1d192819e0b1bd18483d9371563183e
156+
cf_stacks:
157+
- cflinuxfs4
158+
source: https://www.python.org/ftp/python/3.13.9/Python-3.13.9.tgz
159+
source_sha256: c4c066af19c98fb7835d473bebd7e23be84f6e9874d47db9e39a68ee5d0ce35c
160+
- name: python
161+
version: 3.13.9
162+
uri: https://buildpacks.cloudfoundry.org/dependencies/python/python_3.13.9_linux_x64_cflinuxfs5_42c6d33a.tgz
163+
sha256: 42c6d33a0b69becf0ab8c27a7b0c94454672d76bea4c0965627f71053a276e21
164+
cf_stacks:
165+
- cflinuxfs5
166+
source: https://www.python.org/ftp/python/3.13.9/Python-3.13.9.tgz
167+
source_sha256: c4c066af19c98fb7835d473bebd7e23be84f6e9874d47db9e39a68ee5d0ce35c
168+
- name: python
169+
version: 3.14.3
170+
uri: https://buildpacks.cloudfoundry.org/dependencies/python/python_3.14.3_linux_x64_cflinuxfs4_a54b3e20.tgz
171+
sha256: a54b3e20698a979d70fdc15af5a426b6bcf861ba6f37055e1da535c6562a8122
172+
cf_stacks:
173+
- cflinuxfs4
174+
source: https://www.python.org/ftp/python/3.14.3/Python-3.14.3.tgz
175+
source_sha256: d7fe130d0501ae047ca318fa92aa642603ab6f217901015a1df6ce650d5470cd
176+
- name: python
177+
version: 3.14.3
178+
uri: https://buildpacks.cloudfoundry.org/dependencies/python/python_3.14.3_linux_x64_cflinuxfs5_62e6a7a7.tgz
179+
sha256: 62e6a7a7a369c77412c1db87799128cd87a27bbfd14969c01ff4719a7bd7049f
180+
cf_stacks:
181+
- cflinuxfs5
182+
source: https://www.python.org/ftp/python/3.14.3/Python-3.14.3.tgz
183+
source_sha256: d7fe130d0501ae047ca318fa92aa642603ab6f217901015a1df6ce650d5470cd
108184
- name: yarn
109185
version: 1.22.22
110-
uri: https://buildpacks.cloudfoundry.org/dependencies/yarn/yarn_1.22.22_linux_noarch_any-stack_4911d0a6.tgz
111-
sha256: 4911d0a6ccea0b992648fbba16a687917511233552ab87cb8ff4b80259ddfac2
186+
uri: https://buildpacks.cloudfoundry.org/dependencies/yarn/yarn_1.22.22_linux_noarch_any-stack_b6132b86.tgz
187+
sha256: b6132b864c1948174385b4efec842d21cb964c2ae1e79fedcb4eb783ffdaa8a5
112188
cf_stacks:
113189
- cflinuxfs4
114-
- cflinuxfs3
190+
- cflinuxfs5
115191
source: https://github.com/yarnpkg/yarn/releases/download/v1.22.22/yarn-v1.22.22.tar.gz
116192
source_sha256: 88268464199d1611fcf73ce9c0a6c4d44c7d5363682720d8506f6508addf36a0
117193
pre_package: scripts/build.sh

src/nodejs/integration/init_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ func init() {
4141
flag.BoolVar(&settings.Serial, "serial", false, "run serial buildpack tests")
4242
flag.StringVar(&settings.Platform, "platform", "cf", `switchblade platform to test against ("cf" or "docker")`)
4343
flag.StringVar(&settings.GitHubToken, "github-token", "", "use the token to make GitHub API requests")
44-
flag.StringVar(&settings.Stack, "stack", "cflinuxfs3", "stack to use when pushing apps")
44+
flag.StringVar(&settings.Stack, "stack", "cflinuxfs4", "stack to use when pushing apps")
4545
}
4646

4747
func TestIntegration(t *testing.T) {

0 commit comments

Comments
 (0)