Merge branch 'sh-bump-ruby-2.4.5' into 'master'
Upgrade to Ruby 2.4.5 See merge request gitlab-org/gitlab-ce!22484
This commit is contained in:
commit
f5d71ad8f3
|
@ -1,4 +1,4 @@
|
||||||
image: "dev.gitlab.org:5005/gitlab/gitlab-build-images:ruby-2.4.4-golang-1.9-git-2.18-chrome-69.0-node-8.x-yarn-1.2-postgresql-9.6-graphicsmagick-1.3.29"
|
image: "dev.gitlab.org:5005/gitlab/gitlab-build-images:ruby-2.4.5-golang-1.9-git-2.18-chrome-69.0-node-8.x-yarn-1.2-postgresql-9.6-graphicsmagick-1.3.29"
|
||||||
|
|
||||||
.dedicated-runner: &dedicated-runner
|
.dedicated-runner: &dedicated-runner
|
||||||
retry: 1
|
retry: 1
|
||||||
|
@ -6,7 +6,7 @@ image: "dev.gitlab.org:5005/gitlab/gitlab-build-images:ruby-2.4.4-golang-1.9-git
|
||||||
- gitlab-org
|
- gitlab-org
|
||||||
|
|
||||||
.default-cache: &default-cache
|
.default-cache: &default-cache
|
||||||
key: "ruby-2.4.4-debian-stretch-with-yarn"
|
key: "ruby-2.4.5-debian-stretch-with-yarn"
|
||||||
paths:
|
paths:
|
||||||
- vendor/ruby
|
- vendor/ruby
|
||||||
- .yarn-cache/
|
- .yarn-cache/
|
||||||
|
@ -588,7 +588,7 @@ static-analysis:
|
||||||
script:
|
script:
|
||||||
- scripts/static-analysis
|
- scripts/static-analysis
|
||||||
cache:
|
cache:
|
||||||
key: "ruby-2.4.4-debian-stretch-with-yarn-and-rubocop"
|
key: "ruby-2.4.5-debian-stretch-with-yarn-and-rubocop"
|
||||||
paths:
|
paths:
|
||||||
- vendor/ruby
|
- vendor/ruby
|
||||||
- .yarn-cache/
|
- .yarn-cache/
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
2.4.4
|
2.4.5
|
||||||
|
|
|
@ -132,9 +132,9 @@ Remove the old Ruby 1.8 if present:
|
||||||
Download Ruby and compile it:
|
Download Ruby and compile it:
|
||||||
|
|
||||||
mkdir /tmp/ruby && cd /tmp/ruby
|
mkdir /tmp/ruby && cd /tmp/ruby
|
||||||
curl --remote-name --progress https://cache.ruby-lang.org/pub/ruby/2.4/ruby-2.4.4.tar.gz
|
curl --remote-name --progress https://cache.ruby-lang.org/pub/ruby/2.4/ruby-2.4.5.tar.gz
|
||||||
echo 'ec82b0d53bd0adad9b19e6b45e44d54e9ec3f10c ruby-2.4.4.tar.gz' | shasum -c - && tar xzf ruby-2.4.4.tar.gz
|
echo '4d650f302f1ec00256450b112bb023644b6ab6dd ruby-2.4.5.tar.gz' | shasum -c - && tar xzf ruby-2.4.5.tar.gz
|
||||||
cd ruby-2.4.4
|
cd ruby-2.4.5
|
||||||
|
|
||||||
./configure --disable-install-rdoc
|
./configure --disable-install-rdoc
|
||||||
make
|
make
|
||||||
|
|
|
@ -39,9 +39,9 @@ Download Ruby and compile it:
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
mkdir /tmp/ruby && cd /tmp/ruby
|
mkdir /tmp/ruby && cd /tmp/ruby
|
||||||
curl --remote-name --progress https://cache.ruby-lang.org/pub/ruby/2.4/ruby-2.4.4.tar.gz
|
curl --remote-name --progress https://cache.ruby-lang.org/pub/ruby/2.4/ruby-2.4.5.tar.gz
|
||||||
echo 'ec82b0d53bd0adad9b19e6b45e44d54e9ec3f10c ruby-2.4.4.tar.gz' | shasum -c - && tar xzf ruby-2.4.4.tar.gz
|
echo '4d650f302f1ec00256450b112bb023644b6ab6dd ruby-2.4.5.tar.gz' | shasum -c - && tar xzf ruby-2.4.5.tar.gz
|
||||||
cd ruby-2.4.4
|
cd ruby-2.4.5
|
||||||
|
|
||||||
./configure --disable-install-rdoc
|
./configure --disable-install-rdoc
|
||||||
make
|
make
|
||||||
|
|
|
@ -2,5 +2,16 @@ unless Rails.env.production?
|
||||||
require 'haml_lint/rake_task'
|
require 'haml_lint/rake_task'
|
||||||
require 'haml_lint/inline_javascript'
|
require 'haml_lint/inline_javascript'
|
||||||
|
|
||||||
|
# Workaround for warnings from parser/current
|
||||||
|
# Keep it even if it no longer emits any warnings,
|
||||||
|
# because we'll still see warnings in console/server anyway,
|
||||||
|
# and we don't need to break static-analysis for this.
|
||||||
|
task :haml_lint do
|
||||||
|
require 'parser'
|
||||||
|
def Parser.warn(*args)
|
||||||
|
puts(*args) # static-analysis ignores stdout if status is 0
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
HamlLint::RakeTask.new
|
HamlLint::RakeTask.new
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue