From 3a0b6709b125240d4acdf84e94382a957375075c Mon Sep 17 00:00:00 2001 From: Ed Morley <501702+edmorley@users.noreply.github.com> Date: Mon, 23 Oct 2023 22:20:55 +0100 Subject: [PATCH] Clean up supported `[[stacks]]` lists * Removes redundant explicitly named stacks for any buildpack that already supported the wildcard stack. * Switches the corepack buildpack to using the wildcard stack (since it doesn't contain anything stack-specific). * Drops support for the bionic stack from the engine buildpack, since bionic is Ubuntu 18.04, which is EOL (and Heroku-18 support has already been dropped). --- buildpacks/nodejs-corepack/CHANGELOG.md | 1 + buildpacks/nodejs-corepack/buildpack.toml | 8 +------- buildpacks/nodejs-engine/CHANGELOG.md | 4 ++++ buildpacks/nodejs-engine/buildpack.toml | 3 --- buildpacks/nodejs-npm-engine/buildpack.toml | 9 --------- buildpacks/nodejs-pnpm-install/CHANGELOG.md | 4 ++++ buildpacks/nodejs-pnpm-install/buildpack.toml | 9 --------- buildpacks/nodejs-yarn/CHANGELOG.md | 4 ++++ buildpacks/nodejs-yarn/buildpack.toml | 9 --------- buildpacks/npm/CHANGELOG.md | 4 ++++ buildpacks/npm/buildpack.toml | 9 --------- 11 files changed, 18 insertions(+), 46 deletions(-) diff --git a/buildpacks/nodejs-corepack/CHANGELOG.md b/buildpacks/nodejs-corepack/CHANGELOG.md index 9d009e4e..345fbda9 100644 --- a/buildpacks/nodejs-corepack/CHANGELOG.md +++ b/buildpacks/nodejs-corepack/CHANGELOG.md @@ -14,6 +14,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Changed - Updated buildpack description and keywords. ([#692](https://github.com/heroku/buildpacks-nodejs/pull/692)) +- Switched from supporting explicitly named stacks to supporting the wildcard stack. ([#693](https://github.com/heroku/buildpacks-nodejs/pull/693)) ## [1.1.7] - 2023-10-17 diff --git a/buildpacks/nodejs-corepack/buildpack.toml b/buildpacks/nodejs-corepack/buildpack.toml index 24c7c594..7d783639 100644 --- a/buildpacks/nodejs-corepack/buildpack.toml +++ b/buildpacks/nodejs-corepack/buildpack.toml @@ -12,13 +12,7 @@ keywords = ["corepack", "heroku"] type = "MIT" [[stacks]] -id = "heroku-20" - -[[stacks]] -id = "heroku-22" - -[[stacks]] -id = "io.buildpacks.stacks.bionic" +id = "*" [metadata.release] image = { repository = "docker.io/heroku/buildpack-nodejs-corepack" } diff --git a/buildpacks/nodejs-engine/CHANGELOG.md b/buildpacks/nodejs-engine/CHANGELOG.md index 9a1a50c0..21a81f97 100644 --- a/buildpacks/nodejs-engine/CHANGELOG.md +++ b/buildpacks/nodejs-engine/CHANGELOG.md @@ -15,6 +15,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Updated buildpack description and keywords. ([#692](https://github.com/heroku/buildpacks-nodejs/pull/692)) +### Removed + +- Dropped support for the end of life `io.buildpacks.stacks.bionic` stack. ([#693](https://github.com/heroku/buildpacks-nodejs/pull/693)) + ## [1.1.7] - 2023-10-17 - Added Node.js version 20.8.1. diff --git a/buildpacks/nodejs-engine/buildpack.toml b/buildpacks/nodejs-engine/buildpack.toml index bb3073b3..0bdde762 100644 --- a/buildpacks/nodejs-engine/buildpack.toml +++ b/buildpacks/nodejs-engine/buildpack.toml @@ -17,8 +17,5 @@ id = "heroku-20" [[stacks]] id = "heroku-22" -[[stacks]] -id = "io.buildpacks.stacks.bionic" - [metadata.release] image = { repository = "docker.io/heroku/buildpack-nodejs-engine" } diff --git a/buildpacks/nodejs-npm-engine/buildpack.toml b/buildpacks/nodejs-npm-engine/buildpack.toml index b3596e9c..dc23b7df 100644 --- a/buildpacks/nodejs-npm-engine/buildpack.toml +++ b/buildpacks/nodejs-npm-engine/buildpack.toml @@ -14,14 +14,5 @@ type = "MIT" [[stacks]] id = "*" -[[stacks]] -id = "heroku-20" - -[[stacks]] -id = "heroku-22" - -[[stacks]] -id = "io.buildpacks.stacks.bionic" - [metadata.release] image = { repository = "docker.io/heroku/buildpack-nodejs-npm-engine" } diff --git a/buildpacks/nodejs-pnpm-install/CHANGELOG.md b/buildpacks/nodejs-pnpm-install/CHANGELOG.md index 02497ae9..b6451edd 100644 --- a/buildpacks/nodejs-pnpm-install/CHANGELOG.md +++ b/buildpacks/nodejs-pnpm-install/CHANGELOG.md @@ -11,6 +11,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Updated buildpack description and keywords. ([#692](https://github.com/heroku/buildpacks-nodejs/pull/692)) +### Removed + +- Removed redundant explicitly named supported stacks. ([#693](https://github.com/heroku/buildpacks-nodejs/pull/693)) + ## [1.1.7] - 2023-10-17 - No changes. diff --git a/buildpacks/nodejs-pnpm-install/buildpack.toml b/buildpacks/nodejs-pnpm-install/buildpack.toml index b63c2456..d88e3aaa 100644 --- a/buildpacks/nodejs-pnpm-install/buildpack.toml +++ b/buildpacks/nodejs-pnpm-install/buildpack.toml @@ -14,14 +14,5 @@ type = "MIT" [[stacks]] id = "*" -[[stacks]] -id = "heroku-20" - -[[stacks]] -id = "heroku-22" - -[[stacks]] -id = "io.buildpacks.stacks.bionic" - [metadata.release] image = { repository = "docker.io/heroku/buildpack-nodejs-pnpm-install" } diff --git a/buildpacks/nodejs-yarn/CHANGELOG.md b/buildpacks/nodejs-yarn/CHANGELOG.md index 087d555b..13abd8a5 100644 --- a/buildpacks/nodejs-yarn/CHANGELOG.md +++ b/buildpacks/nodejs-yarn/CHANGELOG.md @@ -11,6 +11,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Updated buildpack description and keywords. ([#692](https://github.com/heroku/buildpacks-nodejs/pull/692)) +### Removed + +- Removed redundant explicitly named supported stacks. ([#693](https://github.com/heroku/buildpacks-nodejs/pull/693)) + ## [1.1.7] - 2023-10-17 - Added Yarn version 4.0.0-rc.53. diff --git a/buildpacks/nodejs-yarn/buildpack.toml b/buildpacks/nodejs-yarn/buildpack.toml index c9381da7..afcb2ba8 100644 --- a/buildpacks/nodejs-yarn/buildpack.toml +++ b/buildpacks/nodejs-yarn/buildpack.toml @@ -14,14 +14,5 @@ type = "MIT" [[stacks]] id = "*" -[[stacks]] -id = "heroku-20" - -[[stacks]] -id = "heroku-22" - -[[stacks]] -id = "io.buildpacks.stacks.bionic" - [metadata.release] image = { repository = "docker.io/heroku/buildpack-nodejs-yarn" } diff --git a/buildpacks/npm/CHANGELOG.md b/buildpacks/npm/CHANGELOG.md index 9732191c..d3540c54 100644 --- a/buildpacks/npm/CHANGELOG.md +++ b/buildpacks/npm/CHANGELOG.md @@ -11,6 +11,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Updated buildpack display name, description and keywords. ([#692](https://github.com/heroku/buildpacks-nodejs/pull/692)) +### Removed + +- Removed redundant explicitly named supported stacks. ([#693](https://github.com/heroku/buildpacks-nodejs/pull/693)) + ## [1.1.7] - 2023-10-17 - No changes. diff --git a/buildpacks/npm/buildpack.toml b/buildpacks/npm/buildpack.toml index 35b83f61..ebe6a160 100644 --- a/buildpacks/npm/buildpack.toml +++ b/buildpacks/npm/buildpack.toml @@ -13,14 +13,5 @@ type = "MIT" [[stacks]] id = "*" -[[stacks]] -id = "heroku-20" - -[[stacks]] -id = "heroku-22" - -[[stacks]] -id = "io.buildpacks.stacks.bionic" - [metadata.release] image = { repository = "docker.io/heroku/buildpack-nodejs-npm" }