Merge branch 'main' into extract-env-writer

* main: Inline util method only used in one place
2023-09-16 11:12:08 -07:00
parent b2d2a254d7 12a82a6c58
commit 85ce65a4ce
2 changed files with 8 additions and 13 deletions
--- a/lib/kamal/configuration.rb
+++ b/lib/kamal/configuration.rb
@@ -53,7 +53,14 @@ class Kamal::Configuration
  end

  def abbreviated_version
-    Kamal::Utils.abbreviate_version(version)
+    if version
+      # Don't abbreviate <sha>_uncommitted_<etc>
+      if version.include?("_")
+        version
+      else
+        version[0...7]
+      end
+    end
  end

  def minimum_version