File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change 4444 strategy :
4545 fail-fast : false
4646 matrix :
47- builder : ["builder:24", "builder:22"]
47+ builder : ["builder:26", "builder: 24", "builder:22"]
4848 arch : ["amd64", "arm64"]
4949 exclude :
5050 - builder : " builder:22"
8686 # only those and not the unit tests, via the `--ignored` option. On the latest stack
8787 # we run all integration tests, but on older stacks we only run stack-specific tests.
8888 - name : Run integration tests (all tests)
89+ # TODO: Switch to builder:26 once Ubuntu 26.04 is GA and also Python and package manager
90+ # versions have changed, so that we have a suitable historic buildpack version that both
91+ # supports the new stack, and has enough version changes for the cache invalidation tests.
8992 if : matrix.builder == 'builder:24'
9093 run : cargo test --locked -- --ignored --test-threads $(($(nproc)+1))
9194 - name : Run integration tests (stack-specific tests only)
Original file line number Diff line number Diff line change @@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
77
88## [ Unreleased]
99
10+ ### Added
11+
12+ - Added support for Ubuntu 26.04 (and thus Heroku-26 / ` heroku/builder:26 ` ). ([ #550 ] ( https://github.com/heroku/buildpacks-python/pull/550 ) )
13+
1014## [ 6.3.0] - 2026-04-07
1115
1216### Changed
Original file line number Diff line number Diff line change @@ -23,6 +23,10 @@ version = "22.04"
2323name = " ubuntu"
2424version = " 24.04"
2525
26+ [[targets .distros ]]
27+ name = " ubuntu"
28+ version = " 26.04"
29+
2630[[targets ]]
2731os = " linux"
2832arch = " arm64"
@@ -31,5 +35,9 @@ arch = "arm64"
3135name = " ubuntu"
3236version = " 24.04"
3337
38+ [[targets .distros ]]
39+ name = " ubuntu"
40+ version = " 26.04"
41+
3442[metadata .release ]
3543image = { repository = " docker.io/heroku/buildpack-python" }
Original file line number Diff line number Diff line change @@ -16,6 +16,9 @@ use libcnb_test::BuildConfig;
1616use std:: env;
1717use std:: path:: Path ;
1818
19+ // TODO: Switch to builder:26 once Ubuntu 26.04 is GA and also Python and package manager
20+ // versions have changed, so that we have a suitable historic buildpack version that both
21+ // supports the new stack, and has enough version changes for the cache invalidation tests.
1922const DEFAULT_BUILDER : & str = "heroku/builder:24" ;
2023
2124fn default_build_config ( fixture_path : impl AsRef < Path > ) -> BuildConfig {
@@ -26,7 +29,9 @@ fn default_build_config(fixture_path: impl AsRef<Path>) -> BuildConfig {
2629 // to allow configuring the target arch independently of the builder name (eg via env var).
2730 let target_triple = match builder. as_str ( ) {
2831 // Compile the buildpack for ARM64 iff the builder supports multi-arch and the host is ARM64.
29- "heroku/builder:24" if cfg ! ( target_arch = "aarch64" ) => "aarch64-unknown-linux-musl" ,
32+ "heroku/builder:24" | "heroku/builder:26" if cfg ! ( target_arch = "aarch64" ) => {
33+ "aarch64-unknown-linux-musl"
34+ }
3035 _ => "x86_64-unknown-linux-musl" ,
3136 } ;
3237 config. target_triple ( target_triple) ;
You can’t perform that action at this time.
0 commit comments