From 897a1606e7f543fc8f6fa0ccc31e94bee253333f Mon Sep 17 00:00:00 2001
From: Rob Cardy <rob.cardy@shopify.com>
Date: Thu, 2 Apr 2026 13:34:56 -0400
Subject: [PATCH 1/2] Accept both yml and yaml file extensions

---
 app/models/shipit/deploy_spec/file_system.rb | 28 ++++++++++++--------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/app/models/shipit/deploy_spec/file_system.rb b/app/models/shipit/deploy_spec/file_system.rb
index a4a227525..f259f4e24 100644
--- a/app/models/shipit/deploy_spec/file_system.rb
+++ b/app/models/shipit/deploy_spec/file_system.rb
@@ -106,24 +106,30 @@ def load_config
         build_config(config_file_path, config_obj)
       end
 
+      YAML_EXTENSIONS = ["yml", "yaml"].freeze
+
       def shipit_file_names_in_priority_order
-        [
-          "#{app_name}.#{@env}.yml",
-          ".shipit/#{app_name}.#{@env}.yml",
+        YAML_EXTENSIONS.flat_map do |ext|
+          [
+            "#{app_name}.#{@env}.#{ext}",
+            ".shipit/#{app_name}.#{@env}.#{ext}",
 
-          "#{app_name}.yml",
-          ".shipit/#{app_name}.yml",
+            "#{app_name}.#{ext}",
+            ".shipit/#{app_name}.#{ext}",
 
-          "shipit.#{@env}.yml",
-          ".shipit/#{@env}.yml",
+            "shipit.#{@env}.#{ext}",
+            ".shipit/#{@env}.#{ext}",
 
-          "shipit.yml",
-          ".shipit/shipit.yml"
-        ].uniq
+            "shipit.#{ext}",
+            ".shipit/shipit.#{ext}",
+          ]
+        end.uniq
       end
 
       def bare_shipit_filenames
-        ["#{app_name}.yml", "shipit.yml", ".shipit/#{app_name}.yml", ".shipit/shipit.yml"].uniq
+        YAML_EXTENSIONS.flat_map do |ext|
+          ["#{app_name}.#{ext}", "shipit.#{ext}", ".shipit/#{app_name}.#{ext}", ".shipit/shipit.#{ext}"]
+        end.uniq
       end
 
       def config_file_path

From db607e6659a4c4119d4a29c6da2c7fb29afdcd88 Mon Sep 17 00:00:00 2001
From: Rob Cardy <rob.cardy@shopify.com>
Date: Thu, 2 Apr 2026 13:36:11 -0400
Subject: [PATCH 2/2] Remove a comma

---
 app/models/shipit/deploy_spec/file_system.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/shipit/deploy_spec/file_system.rb b/app/models/shipit/deploy_spec/file_system.rb
index f259f4e24..36fac6b3f 100644
--- a/app/models/shipit/deploy_spec/file_system.rb
+++ b/app/models/shipit/deploy_spec/file_system.rb
@@ -121,7 +121,7 @@ def shipit_file_names_in_priority_order
             ".shipit/#{@env}.#{ext}",
 
             "shipit.#{ext}",
-            ".shipit/shipit.#{ext}",
+            ".shipit/shipit.#{ext}"
           ]
         end.uniq
       end