Skip to content

Commit

Permalink
ruby upgrade prd (#265) (#267)
Browse files Browse the repository at this point in the history
* ruby up

* rubocop

* raven out

* je

* fixes

* auth fixes

* amqp

* test

* test

* test

* config

* email fix

* emailfix

* vmsize

* fixes

* removed branch references for travis bundled gems

* use plateform x86_64-linux in Gemfile.lock

* added travis-rollout gem after mistakenly removed
  • Loading branch information
murtaza-swati authored Feb 28, 2024
1 parent 5ed4de5 commit 71842b2
Show file tree
Hide file tree
Showing 145 changed files with 2,885 additions and 2,434 deletions.
81 changes: 81 additions & 0 deletions .rubocop.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,81 @@
require: rubocop-performance
require: rubocop-rspec

Documentation:
Enabled: false
Metrics/ClassLength:
Enabled: false
Style/ClassAndModuleChildren:
Enabled: false
Metrics/LineLength:
Enabled: false
Metrics/MethodLength:
Max: 40
Metrics/CyclomaticComplexity:
Max: 20
Metrics/PerceivedComplexity:
Max: 16
Style/AsciiComments:
Enabled: false
Metrics/AbcSize:
Enabled: false
Style/GuardClause:
Enabled: false
Style/FormatStringToken:
Enabled: false
Lint/AssignmentInCondition:
Enabled: false
Style/IfUnlessModifier:
Enabled: false
Naming/MemoizedInstanceVariableName:
EnforcedStyleForLeadingUnderscores: required
Style/MultilineBlockChain:
Enabled: false
Lint/ConstantDefinitionInBlock:
Enabled: false
Naming/VariableNumber:
Enabled: false
Metrics/BlockLength:
Enabled: false
Lint/ImplicitStringConcatenation:
Enabled: false
Metrics/MethodLength:
Enabled: false
Style/StructInheritance:
Enabled: false
Lint/RescueException:
Enabled: false
Lint/SuppressedException:
Enabled: false
Naming/MemoizedInstanceVariableName:
Enabled: false
Style/SymbolProc:
Enabled: false
RSpec/MultipleMemoizedHelpers:
Enabled: false
RSpec/NamedSubject:
Enabled: false
RSpec/AnyInstance:
Enabled: false
RSpec/ContextWording:
Enabled: false
RSpec/ExampleLength:
Enabled: false
RSpec/MultipleExpectations:
Enabled: false
RSpec/FilePath:
Enabled: false
Naming/MethodParameterName:
Enabled: false
Style/FormatString:
Enabled: false
Style/ModuleFunction:
Enabled: false
RSpec/NestedGroups:
Enabled: false
RSpec/LetSetup:
Enabled: false
RSpec/InstanceVariable:
Enabled: false
RSpec/MissingExampleGroupArgument:
Enabled: false
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.4.10
3.2.2
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ language: ruby
import:
- travis-ci/build-configs:[email protected]

rvm: 2.4.10
rvm: 3.2.2

cache: bundler

Expand All @@ -24,7 +24,7 @@ services:

before_install:
- bundle config https://gems.contribsys.com/ $BUNDLE_GEMS__CONTRIBSYS__COM
- gem install bundler -v 2.3.26
- gem install bundler -v 2.4.14

jobs:
include:
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
FROM ruby:2.4.10-slim
FROM ruby:3.2.2-slim

LABEL maintainer Travis CI GmbH <[email protected]>

# packages required for bundle install
RUN ( \
apt-get update ; \
apt-get install -y --no-install-recommends git make gcc g++ libpq-dev curl \
apt-get install -y --no-install-recommends git make gcc g++ libpq-dev curl libjemalloc-dev\
&& rm -rf /var/lib/apt/lists/* \
)

Expand Down
57 changes: 30 additions & 27 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
source 'https://rubygems.org'

ruby '2.4.10'
ruby '3.2.2'

gem 'sidekiq-pro', source: 'https://gems.contribsys.com'

Expand All @@ -9,50 +9,53 @@ gem 'travis-logger', git: 'https://github.com/travis-ci/travis-logger'
gem 'travis-metrics', git: 'https://github.com/travis-ci/travis-metrics'

gem 'travis-config', git: 'https://github.com/travis-ci/travis-config'
gem 'travis-encrypt'
gem 'travis-encrypt', git: 'https://github.com/travis-ci/travis-encrypt'
gem 'travis-lock', git: 'https://github.com/travis-ci/travis-lock'
gem 'travis-support', git: 'https://github.com/travis-ci/travis-support'
gem 'travis-rollout', '~> 0.0.2'

gem 'travis-rollout', git: 'https://github.com/travis-ci/travis-rollout'
gem 'travis-support', git: 'https://github.com/travis-ci/travis-support'
gem 'metriks', git: 'https://github.com/travis-ci/metriks'
gem 'metriks-librato_metrics', git: 'https://github.com/travis-ci/metriks-librato_metrics'

gem 'marginalia', git: 'https://github.com/travis-ci/marginalia'

gem 'rake'
gem 'jemalloc'
gem 'pg'
gem 'activerecord', '~> 7'
gem 'bunny'
gem 'redis'
gem 'redis-namespace'
gem 'rollout', '~> 1.1.0'
gem 'dalli'
gem 'activerecord'
gem 'faraday'
gem 'faraday_middleware'
gem 'pg', '~> 1'
gem 'rake'
gem 'redis'
gem 'rollout', git: 'https://github.com/travis-ci/rollout'

gem 'gh'
gem 'coder'
gem 'gh', git: 'https://github.com/travis-ci/gh'
gem 'keen'
gem 'sentry-raven'
gem 'simple_states', git: 'https://github.com/svenfuchs/simple_states'
gem 'multi_json'
gem 'coder'
gem 'redlock'
gem 'sentry-ruby'
gem 'simple_states', git: 'https://github.com/travis-ci/simple_states', branch: 'master'

gem 'puma'
gem 'rack-ssl'
gem 'sinatra'
gem 'jwt'
gem 'libhoney'
gem 'puma', '~> 6'
gem 'rack-ssl'
gem 'sinatra', '~> 3'

group :test do
gem 'rspec'
gem 'mocha'
gem 'bourne'
gem 'database_cleaner'
gem 'factory_girl'
gem 'webmock'
gem 'sinatra-contrib'
gem 'rack-test'
gem 'factory_bot'
gem 'mocha', '~> 2'
gem 'pry'
gem 'rack-test'
gem 'rspec', '~> 3.12'
gem 'sinatra-contrib'
gem 'webmock'
end

group :development, :test do
gem 'rubocop', require: false
gem 'rubocop-performance', require: false
gem 'rubocop-rspec', require: false
gem 'simplecov', require: false
gem 'simplecov-console', require: false
end
Loading

0 comments on commit 71842b2

Please sign in to comment.