Skip to content

Commit 8c2e92b

Browse files
author
Vitalie D
authored
Fix bundle and rvm remote (#2083)
* Fix bundle installation for Ruby < 2.5.0 * Fix precompile rake tasks * Use Google storage as remote for rubies
1 parent 2ab6eec commit 8c2e92b

File tree

4 files changed

+15
-14
lines changed

4 files changed

+15
-14
lines changed

Gemfile.lock

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ GEM
4242
minitest (~> 5.1)
4343
thread_safe (~> 0.3, >= 0.3.4)
4444
tzinfo (~> 1.1)
45-
addressable (2.5.2)
46-
public_suffix (>= 2.0.2, < 4.0)
45+
addressable (2.8.4)
46+
public_suffix (>= 2.0.2, < 6.0)
4747
ast (2.4.0)
4848
atomic (1.1.101)
4949
avl_tree (1.1.3)
@@ -62,7 +62,7 @@ GEM
6262
unf (>= 0.0.5, < 1.0.0)
6363
ethon (0.11.0)
6464
ffi (>= 1.3.0)
65-
faraday (0.17.3)
65+
faraday (0.17.6)
6666
multipart-post (>= 1.2, < 3)
6767
faraday_middleware (0.14.0)
6868
faraday (>= 0.7.4, < 1.0)
@@ -107,14 +107,14 @@ GEM
107107
metaclass (~> 0.0.1)
108108
msgpack (1.7.0)
109109
multi_json (1.14.1)
110-
multipart-post (2.1.1)
110+
multipart-post (2.3.0)
111111
mustermann (1.1.1)
112112
ruby2_keywords (~> 0.0.1)
113113
net-http-persistent (3.0.0)
114114
connection_pool (~> 2.2)
115115
net-http-pipeline (1.0.1)
116116
netrc (0.11.0)
117-
octokit (4.18.0)
117+
octokit (4.22.0)
118118
faraday (>= 0.9)
119119
sawyer (~> 0.8.0, >= 0.5.3)
120120
optimist (3.0.1)
@@ -127,7 +127,7 @@ GEM
127127
pry (0.11.3)
128128
coderay (~> 1.1.0)
129129
method_source (~> 0.9.0)
130-
public_suffix (3.0.3)
130+
public_suffix (4.0.7)
131131
puma (3.12.6)
132132
pusher-client (0.6.2)
133133
json

lib/travis/build/rake_tasks.rb

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -239,15 +239,15 @@ def file_update_godep_for_linux
239239
end
240240

241241
def file_update_nvm
242-
latest_release = latest_release_for('creationix/nvm')
242+
latest_release = latest_release_for('nvm-sh/nvm')
243243
logger.info "Latest nvm release is #{latest_release}"
244-
fetch_githubusercontent_file "creationix/nvm/#{latest_release}/nvm.sh"
244+
fetch_githubusercontent_file "nvm-sh/nvm/#{latest_release}/nvm.sh"
245245
end
246246

247247
def file_update_nvm_exec
248-
latest_release = latest_release_for('creationix/nvm')
248+
latest_release = latest_release_for('nvm-sh/nvm')
249249
logger.info "Latest nvm release is #{latest_release}"
250-
fetch_githubusercontent_file "creationix/nvm/#{latest_release}/nvm-exec"
250+
fetch_githubusercontent_file "nvm-sh/nvm/#{latest_release}/nvm-exec"
251251
end
252252

253253
def file_update_sbt

lib/travis/build/script/shared/rvm.rb

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ module RVM
99
}
1010

1111
CONFIG = %w(
12-
rvm_remote_server_url=https://s3.amazonaws.com/travis-rubies/binaries
12+
rvm_remote_server_url=https://storage.googleapis.com/travis-ci-language-archives/ruby/binaries
1313
rvm_remote_server_type=rubies
1414
rvm_remote_server_verify_downloads=1
1515
)
@@ -27,7 +27,7 @@ module RVM
2727
pkuczynski
2828
)
2929

30-
BUNDLER2_RUBY = '2.3.0'
30+
BUNDLER2_RUBY = '2.5.0'
3131

3232
def export
3333
super
@@ -83,6 +83,7 @@ def setup_rvm
8383
if without_teeny?(version)
8484
setup_rvm_aliases
8585
end
86+
sh.cmd('echo "" > /home/travis/.rvm/config/remote', echo: false, assert: false, timing: false)
8687
sh.cmd('type rvm &>/dev/null || source ~/.rvm/scripts/rvm', echo: false, assert: false, timing: false)
8788
sh.file '$rvm_path/user/db', CONFIG.join("\n")
8889
send rvm_strategy

spec/build/rake_tasks_spec.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ def tmp_top
2525

2626
%w[
2727
/
28-
/creationix/nvm/v1.2.5/nvm-exec
29-
/creationix/nvm/v1.2.5/nvm.sh
28+
/nvm-sh/nvm/v1.2.5/nvm-exec
29+
/nvm-sh/nvm/v1.2.5/nvm.sh
3030
/paulp/sbt-extras/master/sbt
3131
/sc-linux.tar.gz
3232
/sc-osx.zip

0 commit comments

Comments
 (0)