satorix 1.5.4 → 1.5.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/Gemfile.lock +1 -1
- data/lib/satorix/CI/shared/buildpack_manager.rb +9 -11
- data/lib/satorix/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: dc6bd468dd4fba0a0ac8c6d94341624a2e385ab54fc34139d1d803f30bd66bda
|
|
4
|
+
data.tar.gz: e2a5cf3ff80f12f84ed4384a7945db2da1d67bfba1190fda781603318ccd3c7b
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 5c0cfd63d2dacbca6293bc9ad1a1cfea06954e61c415184315835bcabf36d41a54b6c1fe878c597c1d3248a801c32d5b25a5542d288644f11a20b968b9314822
|
|
7
|
+
data.tar.gz: 0cb0d11459549ae91afce72c32c9308ec2018a81c2f79f06c85a69b8131b89c17a2476cb7101d6b4216f3635f798216483a51cf3d3b9ff378cf9152f93b7f104
|
data/Gemfile.lock
CHANGED
|
@@ -110,6 +110,11 @@ module Satorix
|
|
|
110
110
|
end
|
|
111
111
|
|
|
112
112
|
|
|
113
|
+
def lsb_release
|
|
114
|
+
run_command('lsb_release --release --short', quiet: true).chomp
|
|
115
|
+
end
|
|
116
|
+
|
|
117
|
+
|
|
113
118
|
def prepare_buildpack_environment
|
|
114
119
|
log_bench 'Preparing buildpack environment...' do
|
|
115
120
|
set_buildpack_expectations
|
|
@@ -172,7 +177,6 @@ module Satorix
|
|
|
172
177
|
ENV['REQUEST_ID'] = "commit-#{ Satorix.ci_commit_sha }"
|
|
173
178
|
ENV['STACK'] = stack_version
|
|
174
179
|
ENV['DATABASE_URL'] = Satorix::CI::Test::Shared::Database.url
|
|
175
|
-
|
|
176
180
|
ENV['CURL_CONNECT_TIMEOUT'] = '30'
|
|
177
181
|
ENV['CURL_TIMEOUT'] = '600'
|
|
178
182
|
end
|
|
@@ -186,17 +190,11 @@ module Satorix
|
|
|
186
190
|
|
|
187
191
|
|
|
188
192
|
def stack_version
|
|
189
|
-
if
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
|
|
193
|
-
elsif line =~ /DISTRIB_RELEASE=18.04/
|
|
194
|
-
return 'heroku-18'
|
|
195
|
-
end
|
|
196
|
-
end
|
|
193
|
+
if lsb_release == '14.04'
|
|
194
|
+
return 'cedar-14'
|
|
195
|
+
else
|
|
196
|
+
return 'heroku-18'
|
|
197
197
|
end
|
|
198
|
-
# Fallback to heroku-18 if we can't determine a stack
|
|
199
|
-
return 'heroku-18'
|
|
200
198
|
end
|
|
201
199
|
|
|
202
200
|
|
data/lib/satorix/version.rb
CHANGED
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: satorix
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 1.5.
|
|
4
|
+
version: 1.5.5
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Satorix
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2020-
|
|
11
|
+
date: 2020-06-05 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: airbrake-ruby
|