From 505b02ad624f4b49ef5c878e622f8d0835c6dc37 Mon Sep 17 00:00:00 2001
From: Mars Hall <mars@heroku.com>
Date: Thu, 26 Sep 2024 15:50:14 -0700
Subject: [PATCH] New heroku/release-phase dependency

---
 builder/README.md                             | 16 ++++++++++++----
 builder/builder.toml                          |  8 ++++++--
 meta-buildpacks/website-nodejs/buildpack.toml |  8 ++++++--
 meta-buildpacks/website-nodejs/package.toml   |  4 ++++
 meta-buildpacks/website/buildpack.toml        |  6 +++++-
 meta-buildpacks/website/package.toml          |  4 ++++
 6 files changed, 37 insertions(+), 9 deletions(-)

diff --git a/builder/README.md b/builder/README.md
index b5cd7bb..bac56eb 100644
--- a/builder/README.md
+++ b/builder/README.md
@@ -22,9 +22,17 @@ Then, commit and `git push heroku` to a Fir app.
 
 *Buildpack version numbers should be set in the follwoing commands, after running [Prepare Release workflow](../README.md#releasing-a-new-version).*
 
-Generate an internal preview builder for these buildpacks:
+To generate an internal preview builder for these buildpacks:
+
+Start from a working directory that contains both repo directories `buildpacks-release-phase/` & `buildpacks-frontend-web/`, checked-out to the commit to package & release.
 
 ```bash
+cd ../buildpacks-release-phase
+cargo libcnb package --release --target aarch64-unknown-linux-musl
+pack buildpack package release-phase --config packaged/aarch64-unknown-linux-musl/release/heroku_release-phase/package.toml  --target "linux/arm64" --format file
+mv release-phase.cnb ../buildpacks-frontend-web/
+
+cd ../buildpacks-frontend-web
 cargo libcnb package --release --target aarch64-unknown-linux-musl
 pack buildpack package website --config packaged/aarch64-unknown-linux-musl/release/heroku_website/package.toml  --target "linux/arm64" --format file
 pack buildpack package website-nodejs --config packaged/aarch64-unknown-linux-musl/release/heroku_website-nodejs/package.toml  --target "linux/arm64" --format file
@@ -39,9 +47,9 @@ Using https://github.com/heroku/builder-test-public
 export CR_PAT=XXXXX
 echo $CR_PAT | docker login ghcr.io -u mars --password-stdin
 
-# push the specific version
-docker tag frontend-web-builder ghcr.io/heroku/builder-test-public:frontend-web-builder-0.1.1_linux-arm64
-docker push ghcr.io/heroku/builder-test-public:frontend-web-builder-0.1.1_linux-arm64
+# push the specific version (set this example to the correct new version)
+docker tag frontend-web-builder ghcr.io/heroku/builder-test-public:frontend-web-builder-0.2.0_linux-arm64
+docker push ghcr.io/heroku/builder-test-public:frontend-web-builder-0.2.0_linux-arm64
 
 # also push as "latest"
 docker tag frontend-web-builder ghcr.io/heroku/builder-test-public:frontend-web-builder-latest_linux-arm64
diff --git a/builder/builder.toml b/builder/builder.toml
index 5a643a3..b8c1b29 100644
--- a/builder/builder.toml
+++ b/builder/builder.toml
@@ -19,12 +19,16 @@ mirrors = ["public.ecr.aws/heroku/heroku:24"]
   id = "heroku/website"
   uri = "../website.cnb"
 
+[[buildpacks]]
+  id = "heroku/release-phase"
+  uri = "../release-phase.cnb"
+
 [[order]]
   [[order.group]]
     id = "heroku/website-nodejs"
-    version = "0.1.1"
+    version = "0.3.0"
 
 [[order]]
   [[order.group]]
     id = "heroku/website"
-    version = "0.1.1"
+    version = "0.3.0"
diff --git a/meta-buildpacks/website-nodejs/buildpack.toml b/meta-buildpacks/website-nodejs/buildpack.toml
index 22e0ad1..0eb11b3 100644
--- a/meta-buildpacks/website-nodejs/buildpack.toml
+++ b/meta-buildpacks/website-nodejs/buildpack.toml
@@ -2,7 +2,7 @@ api = "0.10"
 
 [buildpack]
 id = "heroku/website-nodejs"
-version = "0.1.1"
+version = "0.3.0"
 name = "Heroku Website/Node.js"
 description = "Heroku's buildpack for static web apps that require Node.js for build."
 keywords = ["ember", "emberjs", "heroku"]
@@ -14,7 +14,11 @@ type = "MIT"
 
 [[order.group]]
 id = "heroku/nodejs"
-version = "3.2.13"
+version = "3.2.14"
+
+[[order.group]]
+id = "heroku/release-phase"
+version = "0.2.0"
 
 [[order.group]]
 id = "heroku/static-web-server"
diff --git a/meta-buildpacks/website-nodejs/package.toml b/meta-buildpacks/website-nodejs/package.toml
index 0ba9d3b..bba6bb3 100644
--- a/meta-buildpacks/website-nodejs/package.toml
+++ b/meta-buildpacks/website-nodejs/package.toml
@@ -4,6 +4,10 @@ uri = "."
 [[dependencies]]
 uri = "libcnb:heroku/website-ember"
 
+[[dependencies]]
+# Where does this come from? See /builder/README.md
+uri = "../../release-phase.cnb"
+
 [[dependencies]]
 uri = "urn:cnb:registry:heroku/nodejs"
 
diff --git a/meta-buildpacks/website/buildpack.toml b/meta-buildpacks/website/buildpack.toml
index 8ad27ec..4fe8ae3 100644
--- a/meta-buildpacks/website/buildpack.toml
+++ b/meta-buildpacks/website/buildpack.toml
@@ -2,7 +2,7 @@ api = "0.10"
 
 [buildpack]
 id = "heroku/website"
-version = "0.1.1"
+version = "0.3.0"
 name = "Heroku Website"
 description = "Heroku's buildpack for static websites."
 keywords = ["website", "html", "javascript", "css", "static", "heroku"]
@@ -12,6 +12,10 @@ type = "MIT"
 
 [[order]]
 
+[[order.group]]
+id = "heroku/release-phase"
+version = "0.2.0"
+
 [[order.group]]
 id = "heroku/static-web-server"
 version = "0.1.1"
diff --git a/meta-buildpacks/website/package.toml b/meta-buildpacks/website/package.toml
index 38080b3..ca096e8 100644
--- a/meta-buildpacks/website/package.toml
+++ b/meta-buildpacks/website/package.toml
@@ -4,5 +4,9 @@ uri = "."
 [[dependencies]]
 uri = "libcnb:heroku/website-public-html"
 
+[[dependencies]]
+# Where does this come from? See /builder/README.md
+uri = "../../release-phase.cnb"
+
 [[dependencies]]
 uri = "libcnb:heroku/static-web-server"