diff options
| author | Bundlerbot <bot@bundler.io> | 2019-05-29 18:53:50 +0000 |
|---|---|---|
| committer | Bundlerbot <bot@bundler.io> | 2019-05-29 18:53:50 +0000 |
| commit | 8dd59e3ba97eb80a599f8149f31bf40773b69dc0 (patch) | |
| tree | 45f5ef9c1abd1a3aabc20211b9c398045eb48219 | |
| parent | c1efbdbadf7d677ced5b8b8ffa585b1bac6a8153 (diff) | |
| parent | 7809393a6d18781ac96f6d009a677af70fa59450 (diff) | |
| download | bundler-8dd59e3ba97eb80a599f8149f31bf40773b69dc0.tar.gz | |
Merge #7188
7188: Second try at azure fix r=deivid-rodriguez a=deivid-rodriguez
This is a followup to #7186.
### What was the end-user problem that led to this PR?
The problem was that Azure CI is still unstable.
### What was your diagnosis of the problem?
My diagnosis was that sometimes MRI 2.4.3 is used, and sometimes MRI 2.4.5 is used instead.
### What is your fix for the problem, implemented in this PR?
My fix, for now, is to make the steps independent from the ruby included in the container that it's run.
### Why did you choose this fix out of the possible options?
I chose this fix because other better fixes require more work and I don't want to spend a lot of time on this at the moment.
Co-authored-by: David RodrÃguez <deivid.rodriguez@riseup.net>
| -rw-r--r-- | .azure-pipelines/patch_readline.sh | 3 | ||||
| -rw-r--r-- | .azure-pipelines/steps.yml | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/.azure-pipelines/patch_readline.sh b/.azure-pipelines/patch_readline.sh new file mode 100644 index 0000000000..69bf661a1b --- /dev/null +++ b/.azure-pipelines/patch_readline.sh @@ -0,0 +1,3 @@ +ruby_version=$(ruby -e 'puts RUBY_VERSION') + +git apply --ignore-space-change --ignore-whitespace '.azure-pipelines\rbreadline.diff' --directory="C:/hostedtoolcache/windows/Ruby/$ruby_version/x64/lib/ruby/site_ruby" --unsafe-paths diff --git a/.azure-pipelines/steps.yml b/.azure-pipelines/steps.yml index fc644a90a1..d23c52b584 100644 --- a/.azure-pipelines/steps.yml +++ b/.azure-pipelines/steps.yml @@ -2,7 +2,7 @@ steps: - task: UseRubyVersion@0 inputs: - versionSpec: '= 2.4.5' + versionSpec: '= 2.4' - script: | ruby -v @@ -16,7 +16,7 @@ steps: displayName: 'work around readline crash (for https://github.com/bundler/bundler/issues/6902)' - script: | - git apply --ignore-space-change --ignore-whitespace .azure-pipelines\rbreadline.diff --directory=C:/hostedtoolcache/windows/Ruby/2.4.5/x64/lib/ruby/site_ruby --unsafe-paths + bash .azure-pipelines\patch_readline.sh displayName: 'patch local readline implementation (for https://github.com/bundler/bundler/issues/6907)' - script: | |