Skip to content
Snippets Groups Projects
Commit 61ba340e authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets
Browse files

rollback sidekiq to 2.8.0. Fail build if exception in runner

parent dea2c19c
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -29,7 +29,7 @@ gem 'haml-rails'
# Background jobs
gem 'slim'
gem 'sinatra', :require => nil
gem 'sidekiq'
gem 'sidekiq', '2.8.0'
 
# Scheduled
gem 'whenever', require: false
Loading
Loading
Loading
Loading
@@ -191,7 +191,7 @@ GEM
settingslogic (2.0.8)
shoulda-matchers (1.3.0)
activesupport (>= 3.0.0)
sidekiq (2.9.0)
sidekiq (2.8.0)
celluloid (~> 0.12.0)
connection_pool (~> 1.0)
multi_json (~> 1)
Loading
Loading
@@ -274,7 +274,7 @@ DEPENDENCIES
sass-rails (~> 3.2.3)
settingslogic
shoulda-matchers
sidekiq
sidekiq (= 2.8.0)
sinatra
slim
stamp
Loading
Loading
Loading
Loading
@@ -103,6 +103,12 @@ class Runner
end
 
@process.exit_code == 0
rescue => e
# return false if any exception occurs
@output << e.message
false
ensure
@tmp_file.rewind
@output << GitlabCi::Encode.encode!(@tmp_file.read)
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment