From 5a8c18e8ad88e8da3bf7b29d7388460515a72a5f Mon Sep 17 00:00:00 2001
From: Richard Schneeman <rschneeman@salesforce.com>
Date: Fri, 18 Jul 2025 13:32:56 -0500
Subject: [PATCH 1/4] Fix hatchet:setup_ci not printing

Close #219
---
 CHANGELOG.md         | 2 ++
 lib/hatchet/tasks.rb | 6 +++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 397f5d8..eee2f73 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,7 @@
 ## HEAD
 
+- Fix `hatchet:setup_ci` not printing output (https://github.com/heroku/hatchet/pull/220)
+
 ## 8.0.5
 
 - Updated excon version requirements (https://github.com/heroku/hatchet/pull/215)
diff --git a/lib/hatchet/tasks.rb b/lib/hatchet/tasks.rb
index 5a49ccb..f039113 100644
--- a/lib/hatchet/tasks.rb
+++ b/lib/hatchet/tasks.rb
@@ -1,7 +1,11 @@
 namespace :hatchet do
   task :setup_ci do
     script = File.expand_path(File.join(__dir__, "../../etc/ci_setup.rb"))
-    out = `#{script}`
+    puts "Running script `#{script}`"
+    out = `#{script} 2>&1`
+    puts "Done"
+    puts "Output:\n"
+    puts out
     raise "Command #{script.inspect} failed\n#{out}" unless $?.success?
   end
 

From 46a6776f1015b18837de4ca3217877b52819dc46 Mon Sep 17 00:00:00 2001
From: Schneems <richard.schneeman+foo@gmail.com>
Date: Fri, 18 Jul 2025 13:43:26 -0500
Subject: [PATCH 2/4] Fix tests (remove heroku-20)

---
 README.md                | 2 +-
 spec/hatchet/app_spec.rb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index c1a2331..1376c2a 100644
--- a/README.md
+++ b/README.md
@@ -587,7 +587,7 @@ app.get_config("DEPLOY_TASKS") # => "run:bloop"
 
 - `app.set_lab()`: Enables the specified lab/feature on the app
 - `app.add_database()`: adds a database to the app, defaults to the "dev" database
-- `app.update_stack()`: Change the app's stack to that specified (for example `"heroku-20"`). Will take effect on the next build.
+- `app.update_stack()`: Change the app's stack to that specified (for example `"heroku-24"`). Will take effect on the next build.
 - `app.run()`: Runs a `heroku run bash` session with the arguments, covered above.
 - `app.run_multi()`: Runs a `heroku run bash` session in the background and yields the results. This requires the `run_multi` flag of the app to be set to `true`, which will charge your application (the `HATCHET_EXPENSIVE_MODE` env var must also be set to use this feature). Example above.
 - `app.create_app`: Can be used to manually create the app without deploying it (You probably want `setup!` though)
diff --git a/spec/hatchet/app_spec.rb b/spec/hatchet/app_spec.rb
index 6684abe..de62ce5 100644
--- a/spec/hatchet/app_spec.rb
+++ b/spec/hatchet/app_spec.rb
@@ -23,7 +23,7 @@
   end
 
   it "create app with stack" do
-    stack = "heroku-20"
+    stack = "heroku-24"
     app = Hatchet::App.new("default_ruby", stack: stack)
     app.create_app
     expect(app.platform_api.app.info(app.name)["build_stack"]["name"]).to eq(stack)

From 0f5eca6f7ffc76653f60f6a5a9268c16bf61c927 Mon Sep 17 00:00:00 2001
From: Schneems <richard.schneeman+foo@gmail.com>
Date: Fri, 18 Jul 2025 13:46:52 -0500
Subject: [PATCH 3/4] v8.0.6

---
 CHANGELOG.md           | 2 ++
 lib/hatchet/version.rb | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index eee2f73..29e9503 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,7 @@
 ## HEAD
 
+## 8.0.6
+
 - Fix `hatchet:setup_ci` not printing output (https://github.com/heroku/hatchet/pull/220)
 
 ## 8.0.5
diff --git a/lib/hatchet/version.rb b/lib/hatchet/version.rb
index a3b862f..24b8ff8 100644
--- a/lib/hatchet/version.rb
+++ b/lib/hatchet/version.rb
@@ -1,3 +1,3 @@
 module Hatchet
-  VERSION = "8.0.5"
+  VERSION = "8.0.6"
 end

From e790804c187f27302fe2dc489620a49a96bdce81 Mon Sep 17 00:00:00 2001
From: Schneems <richard.schneeman+foo@gmail.com>
Date: Fri, 18 Jul 2025 14:24:29 -0500
Subject: [PATCH 4/4] Don't print output twice

---
 lib/hatchet/tasks.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/hatchet/tasks.rb b/lib/hatchet/tasks.rb
index f039113..0cb1c7f 100644
--- a/lib/hatchet/tasks.rb
+++ b/lib/hatchet/tasks.rb
@@ -6,7 +6,7 @@
     puts "Done"
     puts "Output:\n"
     puts out
-    raise "Command #{script.inspect} failed\n#{out}" unless $?.success?
+    raise "Command #{script.inspect} failed" unless $?.success?
   end
 
   task :setup_travis do