From 3da7fad9ee0d0c0c8c749760bbefab490a9c911e Mon Sep 17 00:00:00 2001 From: Donal McBreen Date: Thu, 20 Jun 2024 08:11:18 +0100 Subject: [PATCH] Revert "Envify already env pushes" --- lib/kamal/cli/main.rb | 1 + test/cli/main_test.rb | 2 ++ 2 files changed, 3 insertions(+) diff --git a/lib/kamal/cli/main.rb b/lib/kamal/cli/main.rb index 735c55f1..7f35da95 100644 --- a/lib/kamal/cli/main.rb +++ b/lib/kamal/cli/main.rb @@ -11,6 +11,7 @@ class Kamal::Cli::Main < Kamal::Cli::Base say "Evaluate and push env files...", :magenta invoke "kamal:cli:main:envify", [], invoke_options + invoke "kamal:cli:env:push", [], invoke_options invoke "kamal:cli:accessory:boot", [ "all" ], invoke_options deploy diff --git a/test/cli/main_test.rb b/test/cli/main_test.rb index 94748fe8..4db97aaf 100644 --- a/test/cli/main_test.rb +++ b/test/cli/main_test.rb @@ -6,6 +6,7 @@ class CliMainTest < CliTestCase Kamal::Cli::Main.any_instance.expects(:invoke).with("kamal:cli:server:bootstrap", [], invoke_options) Kamal::Cli::Main.any_instance.expects(:invoke).with("kamal:cli:main:envify", [], invoke_options) + Kamal::Cli::Main.any_instance.expects(:invoke).with("kamal:cli:env:push", [], invoke_options) Kamal::Cli::Main.any_instance.expects(:invoke).with("kamal:cli:accessory:boot", [ "all" ], invoke_options) Kamal::Cli::Main.any_instance.expects(:deploy) @@ -19,6 +20,7 @@ class CliMainTest < CliTestCase invoke_options = { "config_file" => "test/fixtures/deploy_simple.yml", "version" => "999", "skip_hooks" => false } Kamal::Cli::Main.any_instance.expects(:invoke).with("kamal:cli:server:bootstrap", [], invoke_options) + Kamal::Cli::Main.any_instance.expects(:invoke).with("kamal:cli:env:push", [], invoke_options) Kamal::Cli::Main.any_instance.expects(:invoke).with("kamal:cli:main:envify", [], invoke_options) Kamal::Cli::Main.any_instance.expects(:invoke).with("kamal:cli:accessory:boot", [ "all" ], invoke_options) # deploy