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

update ruby to 2.6.0 #167

Merged
merged 4 commits into from
Oct 28, 2024
Merged
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 .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
- name: Set up Ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: 2.5.0
ruby-version: 2.5.3
- run: |
bundle install
- name: Deploy to production
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ruby.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
- name: Setup Ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: 2.5.0
ruby-version: 2.5.3
- run: |
bundle install --without production development
- env:
Expand All @@ -51,7 +51,7 @@ jobs:
- name: Setup Ruby and install gems
uses: ruby/setup-ruby@v1
with:
ruby-version: 2.5.0
ruby-version: 2.5.3
- run: |
bundle install --without production development
- name: Run rubocop
Expand Down
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
language: ruby
cache: bundler
rvm: 2.5.0
rvm: 2.5.3
bundler_args: "--without production development"
services: postgresql

Expand Down
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ git_source(:github) { |name| "https://github.com/#{name}.git" }
### BASICS

# Ruby version
ruby '2.5.0'
ruby '2.5.3'
# Rails version
gem 'rails', '~> 4'
# Use postgres as database
Expand Down
2 changes: 1 addition & 1 deletion Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -436,7 +436,7 @@ DEPENDENCIES
wkhtmltopdf-binary

RUBY VERSION
ruby 2.5.0p0
ruby 2.5.3

BUNDLED WITH
1.17.3
2 changes: 1 addition & 1 deletion db/structure.sql
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ COMMENT ON EXTENSION pg_trgm IS 'text similarity measurement and index searching

SET default_tablespace = '';

SET default_table_access_method = heap;
-- SET default_table_access_method = heap;

--
-- Name: about_users; Type: TABLE; Schema: public; Owner: -
Expand Down
4 changes: 2 additions & 2 deletions scripts/provision.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ su ubuntu <<'EOF'
gpg --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3
curl -sSL https://get.rvm.io | bash -s stable
source ~/.rvm/scripts/rvm
rvm install 2.5.0
rvm use 2.5.0 --default
rvm install 2.5.3
rvm use 2.5.3 --default
gem install bundler
cd /vagrant
cp config/database.yml.default config/database.yml
Expand Down
2 changes: 1 addition & 1 deletion test/models/long_submission_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ class LongSubmissionTest < ActiveSupport::TestCase
end

test 'text to score' do
assert_equal LongSubmission.text_to_score('-'), nil
assert_nil LongSubmission.text_to_score('-')
assert_equal LongSubmission.text_to_score('100'), 100
end

Expand Down
Loading