Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ruby 3.2 bump #2088

Open
wants to merge 13 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.5.9
3.2.2
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
language: ruby
dist: bionic
rvm: 2.5.9
rvm: 3.2.2

services:
- redis
Expand Down
9 changes: 7 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ruby:2.5.9 as builder
FROM ruby:3.2.2 as builder

ARG GITHUB_OAUTH_TOKEN=notset

Expand All @@ -18,14 +18,19 @@ RUN bundle exec rake assets:precompile GITHUB_OAUTH_TOKEN=$GITHUB_OAUTH_TOKEN
RUN tar -cjf public.tar.bz2 public && rm -rf public


FROM ruby:2.5.9-slim
FROM ruby:3.2.2-slim

LABEL maintainer Travis CI GmbH <[email protected]>

ENV TRAVIS_BUILD_DUMP_BACKTRACE true
ENV PORT 4000

RUN gem update --system 3.3.26 > /dev/null 2>&1
RUN ( \
apt-get update ; \
apt-get install -y --no-install-recommends libjemalloc-dev\
&& rm -rf /var/lib/apt/lists/* \
)

WORKDIR /app

Expand Down
18 changes: 10 additions & 8 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,40 +5,42 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" }

ruby File.read(File.expand_path('.ruby-version', __dir__)).strip

gem 'activesupport', '~> 4.0'
gem 'activesupport', '~> 7'
gem 'addressable', '~> 2.3'
gem 'codeclimate-test-reporter', require: false, group: %i[development test]
gem 'coder'
gem 'connection_pool'
gem 'faraday'
gem 'faraday_middleware'
gem 'jemalloc', github: 'travis-ci/jemalloc-rb'
gem 'jwt', '~> 1.5'
gem 'metriks', '0.9.9.6'
gem 'metriks-librato_metrics', github: 'eric/metriks-librato_metrics'
gem 'minitar'
gem 'mocha', require: false, group: %i[development test]
gem 'parallel_tests', require: false, group: %i[development test]
gem 'pry', require: false, group: %i[development test]
gem 'pry', '>= 0.14.2', require: false, group: %i[development test]
gem 'webmock', group: :test
gem 'puma'
gem 'rack', '>= 2.1.4'
gem 'rack', '>= 2.2.4'
gem 'rack-ssl', '~> 1.4'
gem 'rack-test'
gem 'rack-test', '>= 2.1.0'
gem 'rake'
gem 'rbtrace'
gem 'rerun', require: false, group: :development
gem 'rspec', '~> 3.0', group: %i[development test]
gem 'rubocop', require: false, group: %i[development test]
gem 'sentry-raven'
gem 'simplecov', require: false, group: %i[development test]
gem 'sinatra'
gem 'sinatra-contrib'
gem 'sinatra', '>= 3.0.6'
gem 'travis'
gem 'travis-config'
gem 'travis-config', github: 'travis-ci/travis-config', branch: 'prd-ruby-upgrade-dev'
gem 'travis-github_apps', github: 'travis-ci/travis-github_apps'
gem 'travis-rollout', github: 'travis-ci/travis-rollout'
gem 'travis-support', github: 'travis-ci/travis-support'

gem "octokit", "~> 4.18"
gem 'rest-client'

github 'sinatra/sinatra' do
gem 'sinatra-contrib'
end
138 changes: 68 additions & 70 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,25 @@ GIT
metriks (>= 0.9.9.6)

GIT
remote: https://github.com/travis-ci/jemalloc-rb.git
revision: e9528e26aff663efa2c124cdeca47700e389097d
remote: https://github.com/sinatra/sinatra.git
revision: 3fe6297a4bec04e279df7842fe50fb7526dea65a
specs:
jemalloc (1.0.2)
rack-protection (3.0.6)
rack
sinatra-contrib (3.0.6)
multi_json
mustermann (~> 3.0)
rack-protection (= 3.0.6)
sinatra (= 3.0.6)
tilt (~> 2.0)

GIT
remote: https://github.com/travis-ci/travis-config.git
revision: f02604a813cce3a672ae89cd7e4adaa30b001532
branch: prd-ruby-upgrade-dev
specs:
travis-config (1.1.5)
hashr (~> 2.0)

GIT
remote: https://github.com/travis-ci/travis-github_apps.git
Expand Down Expand Up @@ -37,11 +52,11 @@ GIT
GEM
remote: https://rubygems.org/
specs:
activesupport (4.2.11.1)
i18n (~> 0.7)
minitest (~> 5.1)
thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
activesupport (7.0.7.2)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 1.6, < 2)
minitest (>= 5.1)
tzinfo (~> 2.0)
addressable (2.8.4)
public_suffix (>= 2.0.2, < 6.0)
ast (2.4.0)
Expand All @@ -51,8 +66,8 @@ GEM
codeclimate-test-reporter (1.0.8)
simplecov (<= 0.13)
coder (0.4.0)
coderay (1.1.2)
concurrent-ruby (1.1.6)
coderay (1.1.3)
concurrent-ruby (1.2.2)
connection_pool (2.2.2)
crack (0.4.5)
rexml
Expand Down Expand Up @@ -81,65 +96,61 @@ GEM
http-accept (1.7.0)
http-cookie (1.0.5)
domain_name (~> 0.5)
i18n (0.9.5)
i18n (1.14.1)
concurrent-ruby (~> 1.0)
jaro_winkler (1.5.1)
json (2.3.1)
jwt (1.5.6)
launchy (2.4.3)
addressable (~> 2.3)
listen (3.1.5)
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
ruby_dep (~> 1.2)
metaclass (0.0.4)
method_source (0.9.0)
listen (3.8.0)
rb-fsevent (~> 0.10, >= 0.10.3)
rb-inotify (~> 0.9, >= 0.9.10)
method_source (1.0.0)
metriks (0.9.9.6)
atomic (~> 1.0)
avl_tree (~> 1.1.2)
hitimes (~> 1.1)
mime-types (3.4.1)
mime-types-data (~> 3.2015)
mime-types-data (3.2022.0105)
minitar (0.6.1)
minitest (5.14.0)
mocha (1.7.0)
metaclass (~> 0.0.1)
msgpack (1.7.0)
minitar (0.9)
minitest (5.19.0)
mocha (2.0.0)
msgpack (1.7.1)
multi_json (1.14.1)
multipart-post (2.3.0)
mustermann (1.1.1)
mustermann (3.0.0)
ruby2_keywords (~> 0.0.1)
net-http-persistent (3.0.0)
net-http-persistent (4.0.2)
connection_pool (~> 2.2)
net-http-pipeline (1.0.1)
netrc (0.11.0)
nio4r (2.5.9)
octokit (4.22.0)
faraday (>= 0.9)
sawyer (~> 0.8.0, >= 0.5.3)
optimist (3.0.1)
parallel (1.12.1)
parallel_tests (2.23.0)
parallel_tests (4.2.1)
parallel
parser (2.5.1.2)
ast (~> 2.4.0)
powerpack (0.1.2)
pry (0.11.3)
coderay (~> 1.1.0)
method_source (~> 0.9.0)
pry (0.14.2)
coderay (~> 1.1)
method_source (~> 1.0)
public_suffix (4.0.7)
puma (3.12.6)
puma (6.3.0)
nio4r (~> 2.0)
pusher-client (0.6.2)
json
websocket (~> 1.0)
rack (2.2.6.2)
rack-protection (2.0.8.1)
rack
rack (2.2.7)
rack-ssl (1.4.1)
rack
rack-test (1.1.0)
rack (>= 1.0, < 3)
rainbow (3.0.0)
rack-test (2.1.0)
rack (>= 1.3)
rainbow (3.1.1)
rake (12.3.3)
rb-fsevent (0.10.3)
rb-inotify (0.9.10)
Expand All @@ -149,7 +160,7 @@ GEM
msgpack (>= 0.4.3)
optimist (>= 3.0.0)
redis (4.1.4)
rerun (0.13.0)
rerun (0.14.0)
listen (~> 3.0)
rest-client (2.1.0)
http-accept (>= 1.7.0, < 2.0)
Expand All @@ -170,42 +181,32 @@ GEM
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.8.0)
rspec-support (3.8.0)
rubocop (0.59.2)
rubocop (0.68.1)
jaro_winkler (~> 1.5.1)
parallel (~> 1.10)
parser (>= 2.5, != 2.5.1.1)
powerpack (~> 0.1)
rainbow (>= 2.2.2, < 4.0)
ruby-progressbar (~> 1.7)
unicode-display_width (~> 1.0, >= 1.0.1)
unicode-display_width (>= 1.4.0, < 1.6)
ruby-progressbar (1.10.0)
ruby2_keywords (0.0.2)
ruby_dep (1.5.0)
ruby2_keywords (0.0.5)
sawyer (0.8.2)
addressable (>= 2.3.5)
faraday (> 0.8, < 2.0)
sentry-raven (2.7.4)
sentry-raven (2.13.0)
faraday (>= 0.7.6, < 1.0)
simplecov (0.13.0)
docile (~> 1.1.0)
json (>= 1.8, < 3)
simplecov-html (~> 0.10.0)
simplecov-html (0.10.2)
sinatra (2.0.8.1)
mustermann (~> 1.0)
rack (~> 2.0)
rack-protection (= 2.0.8.1)
tilt (~> 2.0)
sinatra-contrib (2.0.8.1)
backports (>= 2.8.2)
multi_json
mustermann (~> 1.0)
rack-protection (= 2.0.8.1)
sinatra (= 2.0.8.1)
sinatra (3.0.6)
mustermann (~> 3.0)
rack (~> 2.2, >= 2.2.4)
rack-protection (= 3.0.6)
tilt (~> 2.0)
thread_safe (0.3.6)
tilt (2.0.10)
travis (1.8.9)
tilt (2.2.0)
travis (1.8.13)
backports
faraday (~> 0.9)
faraday_middleware (~> 0.9, >= 0.9.1)
Expand All @@ -214,12 +215,10 @@ GEM
launchy (~> 2.1)
pusher-client (~> 0.4)
typhoeus (~> 0.6, >= 0.6.8)
travis-config (1.1.3)
hashr (~> 2.0)
typhoeus (0.8.0)
ethon (>= 0.8.0)
tzinfo (1.2.7)
thread_safe (~> 0.1)
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
unf (0.1.4)
unf_ext
unf_ext (0.0.8.2)
Expand All @@ -234,26 +233,25 @@ PLATFORMS
ruby

DEPENDENCIES
activesupport (~> 4.0)
activesupport (~> 7)
addressable (~> 2.3)
codeclimate-test-reporter
coder
connection_pool
faraday
faraday_middleware
jemalloc!
jwt (~> 1.5)
metriks (= 0.9.9.6)
metriks-librato_metrics!
minitar
mocha
octokit (~> 4.18)
parallel_tests
pry
pry (>= 0.14.2)
puma
rack (>= 2.1.4)
rack (>= 2.2.4)
rack-ssl (~> 1.4)
rack-test
rack-test (>= 2.1.0)
rake
rbtrace
rerun
Expand All @@ -262,17 +260,17 @@ DEPENDENCIES
rubocop
sentry-raven
simplecov
sinatra
sinatra-contrib
sinatra (>= 3.0.6)
sinatra-contrib!
travis
travis-config
travis-config!
travis-github_apps!
travis-rollout!
travis-support!
webmock

RUBY VERSION
ruby 2.5.9p229
ruby 3.2.2p53

BUNDLED WITH
2.3.26
Loading