shipit-engine 0.44.0 → 0.44.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 66eab74ac8acc7bb806d26984fe9d221983da860661eff6d6ae7e263f71da2f4
-  data.tar.gz: 3b9b797b5bf0ea20278ad9d0145ab2c42e02a6053b0efdc7f30c9838ff81b382
+  metadata.gz: 021ceb8e303c18a51452d849fb476af3da93cbd837af411d4a94e0836f893848
+  data.tar.gz: f3c157eab35e563dcc58f32d4de0c0ad5c0d9c48411c676ef42c8ab30e9dcdd3
 SHA512:
-  metadata.gz: 23fbda676f424e7660165c46636901490b636645b1b51f9dc9755ff24c71ea5cd09f09ac4f734a9708bdc687affb5536a4aaf18849f9606998581aeef6b0b472
-  data.tar.gz: 89878c82e92b1b8780f7198800135fd18cc190ec5276b08bb48a7b1ffba65d4add8013f9e65b4e0af7910b8956c92dbb8b2f3043650e24c419eccdf825cce611
+  metadata.gz: 147c22c3269f4334f52ac357ff5eeebf70599fb01e853d88075de2bce8abb52970704efa1960798c8be533e04c62d776a0303cc95d8354a6f383934c49764e2d
+  data.tar.gz: cff060b1f000c0700d518018e36b0f4ed02ed204417a749c8d176a0d5baa8b4cef669ec71f5d075de55b67787c218d30a44117d5770da41392abe518d25f9c6f

data/app/models/shipit/task_execution_strategy/default.rb

@@ -58,7 +58,11 @@ module Shipit
 
       def perform_task
         capture_all!(@commands.install_dependencies)
-        capture_all!(@commands.perform)
+        if ENV['SHIPIT_DRY_RUN'].present?
+          @task.write("\nSkipping deploy steps (dry run mode)\n")
+        else
+          capture_all!(@commands.perform)
+        end
       end
 
       def checkout_repository

data/app/views/shipit/stacks/_banners.html.erb

@@ -70,7 +70,11 @@
         <p class="banner__text">
           Continuous Delivery for this stack is currently paused because
 
-          <%= link_to_if stack.deployment_checks_passed?, 'the pre-deploy checks failed', stack_commit_checks_path(stack, sha: stack.next_commit_to_deploy.sha) %>.
+          <% if stack.next_commit_to_deploy %>
+            <%= link_to_if stack.deployment_checks_passed?, 'the pre-deploy checks failed', stack_commit_checks_path(stack, sha: stack.next_commit_to_deploy.sha) %>.
+          <% else %>
+            the pre-deploy checks failed.
+          <% end %>
           You can either wait for them to pass, or trigger a deploy manually.
         </p>
       </div>

data/config/secrets.development.shopify.yml

@@ -1,5 +1,4 @@
 host: 'shipit-engine.myshopify.io'
-redis_url: 'redis://shipit-engine.railgun:6379'
 
 # For creating an app see: https://github.com/Shopify/shipit-engine/blob/main/docs/setup.md#creating-the-github-app
 
@@ -21,4 +20,4 @@ github:
     oauth:
       id:
       secret:
-      teams:
+      teams:

data/lib/shipit/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Shipit
-  VERSION = '0.44.0'
+  VERSION = '0.44.2'
 end

data/test/unit/shipit_task_execution_strategy_test.rb

@@ -44,4 +44,41 @@ module Shipit
       Shipit::PerformTaskJob.new.perform(task)
     end
   end
+
+  class DefaultTaskExecutionStrategyDryRunTest < ActiveSupport::TestCase
+    setup do
+      @task = mock('task')
+      @commands = mock('commands')
+      @install_deps = [mock('install_dep_cmd')]
+      @perform_cmds = [mock('perform_cmd')]
+      @commands.stubs(:install_dependencies).returns(@install_deps)
+      @commands.stubs(:perform).returns(@perform_cmds)
+      Shipit::Commands.stubs(:for).with(@task).returns(@commands)
+
+      @strategy = Shipit::TaskExecutionStrategy::Default.new(@task)
+    end
+
+    teardown do
+      ENV.delete('SHIPIT_DRY_RUN')
+    end
+
+    test "perform_task runs both install_dependencies and perform when SHIPIT_DRY_RUN is not set" do
+      @strategy.instance_variable_set(:@commands, @commands)
+      @strategy.expects(:capture_all!).with(@install_deps).once
+      @strategy.expects(:capture_all!).with(@perform_cmds).once
+
+      @strategy.perform_task
+    end
+
+    test "perform_task skips perform when SHIPIT_DRY_RUN is set" do
+      ENV['SHIPIT_DRY_RUN'] = '1'
+
+      @strategy.instance_variable_set(:@commands, @commands)
+      @strategy.expects(:capture_all!).with(@install_deps).once
+      @strategy.expects(:capture_all!).with(@perform_cmds).never
+      @task.expects(:write).with("\nSkipping deploy steps (dry run mode)\n")
+
+      @strategy.perform_task
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shipit-engine
 version: !ruby/object:Gem::Version
-  version: 0.44.0
+  version: 0.44.2
 platform: ruby
 authors:
 - Jean Boussier
@@ -1051,7 +1051,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.4
+rubygems_version: 4.0.6
 specification_version: 4
 summary: Application deployment software
 test_files: