diff options
| author | David RodrÃguez <deivid.rodriguez@riseup.net> | 2019-05-29 18:04:22 +0200 |
|---|---|---|
| committer | David RodrÃguez <deivid.rodriguez@riseup.net> | 2019-05-29 18:06:39 +0200 |
| commit | 2ad135ee9688bead3cf4972bed907be51d3f7615 (patch) | |
| tree | 69c94876d05e106d7edd3186e104110ce8286fc9 | |
| parent | 685208e53764d78e746755ffe02618970dcd9a08 (diff) | |
| download | bundler-2ad135ee9688bead3cf4972bed907be51d3f7615.tar.gz | |
Fix Azure CI issues (second try)
At the moment, some Azure instances use 2.4.5, and others use 2.4.3. No
idea why.
As a solution, I relax the requirement to ">= 2.4", then capture the
exact version we're using, and patch the appropriate readline file
according to that.
| -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..85e7f80efb --- /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: | |