Skip to content

Commit

Permalink
chore: bump ruby from 2.7.1 to 2.7.2 (#1426)
Browse files Browse the repository at this point in the history
Closes:  #1399
  • Loading branch information
azyzio authored Nov 20, 2020
1 parent 29bd05c commit 61d26f7
Show file tree
Hide file tree
Showing 13 changed files with 27 additions and 28 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ defaults: &defaults
working_directory: ~/build
docker:
# specify the version you desire here
- image: circleci/ruby:2.7.1-node-browsers
- image: circleci/ruby:2.7.2-node-browsers

# Specify service dependencies here if necessary
# CircleCI maintains a library of pre-built images
Expand Down
1 change: 0 additions & 1 deletion .env.example
Original file line number Diff line number Diff line change
Expand Up @@ -130,4 +130,3 @@ USE_INBOX_AVATAR_FOR_BOT=true
# if you want to use letter_opener for local emails
# LETTER_OPENER=true


2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.7.1
2.7.2
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
source 'https://rubygems.org'

ruby '2.7.1'
ruby '2.7.2'

##-- base gems for rails --##
gem 'rack-cors', require: 'rack/cors'
Expand Down
2 changes: 1 addition & 1 deletion Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -638,7 +638,7 @@ DEPENDENCIES
wisper (= 2.0.0)

RUBY VERSION
ruby 2.7.1p83
ruby 2.7.2p137

BUNDLED WITH
2.1.4
6 changes: 3 additions & 3 deletions deployment/chatwoot-web.1.service
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ KillMode=mixed
StandardInput=null
SyslogIdentifier=%p

Environment="PATH=/home/chatwoot/.rvm/gems/ruby-2.7.1/bin:/home/chatwoot/.rvm/gems/ruby-2.7.1@global/bin:/home/chatwoot/.rvm/rubies/ruby-2.7.1/bin:/home/chatwoot/.rvm/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/snap/bin:/home/chatwoot/.rvm/bin:/home/chatwoot/.rvm/bin"
Environment="PATH=/home/chatwoot/.rvm/gems/ruby-2.7.2/bin:/home/chatwoot/.rvm/gems/ruby-2.7.2@global/bin:/home/chatwoot/.rvm/rubies/ruby-2.7.2/bin:/home/chatwoot/.rvm/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/snap/bin:/home/chatwoot/.rvm/bin:/home/chatwoot/.rvm/bin"
Environment="PORT=3000"
Environment="RAILS_ENV=production"
Environment="NODE_ENV=production"
Environment="RAILS_LOG_TO_STDOUT=true"
Environment="GEM_HOME=/home/chatwoot/.rvm/gems/ruby-2.7.1"
Environment="GEM_PATH=/home/chatwoot/.rvm/gems/ruby-2.7.1:/home/chatwoot/.rvm/gems/ruby-2.7.1@global"
Environment="GEM_HOME=/home/chatwoot/.rvm/gems/ruby-2.7.2"
Environment="GEM_PATH=/home/chatwoot/.rvm/gems/ruby-2.7.2:/home/chatwoot/.rvm/gems/ruby-2.7.2@global"
6 changes: 3 additions & 3 deletions deployment/chatwoot-worker.1.service
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ KillMode=mixed
StandardInput=null
SyslogIdentifier=%p

Environment="PATH=/home/chatwoot/.rvm/gems/ruby-2.7.1/bin:/home/chatwoot/.rvm/gems/ruby-2.7.1@global/bin:/home/chatwoot/.rvm/rubies/ruby-2.7.1/bin:/home/chatwoot/.rvm/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/snap/bin:/home/chatwoot/.rvm/bin:/home/chatwoot/.rvm/bin"
Environment="PATH=/home/chatwoot/.rvm/gems/ruby-2.7.2/bin:/home/chatwoot/.rvm/gems/ruby-2.7.2@global/bin:/home/chatwoot/.rvm/rubies/ruby-2.7.2/bin:/home/chatwoot/.rvm/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/snap/bin:/home/chatwoot/.rvm/bin:/home/chatwoot/.rvm/bin"
Environment="PORT=3000"
Environment="RAILS_ENV=production"
Environment="NODE_ENV=production"
Environment="RAILS_LOG_TO_STDOUT=true"
Environment="GEM_HOME=/home/chatwoot/.rvm/gems/ruby-2.7.1"
Environment="GEM_PATH=/home/chatwoot/.rvm/gems/ruby-2.7.1:/home/chatwoot/.rvm/gems/ruby-2.7.1@global"
Environment="GEM_HOME=/home/chatwoot/.rvm/gems/ruby-2.7.2"
Environment="GEM_PATH=/home/chatwoot/.rvm/gems/ruby-2.7.2:/home/chatwoot/.rvm/gems/ruby-2.7.2@global"
4 changes: 2 additions & 2 deletions deployment/setup_18.04.sh
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@ RAILS_ENV=production
sudo -i -u chatwoot << EOF
rvm --version
rvm autolibs disable
rvm install "ruby-2.7.1"
rvm use 2.7.1 --default
rvm install "ruby-2.7.2"
rvm use 2.7.2 --default
git clone https://github.com/chatwoot/chatwoot.git
cd chatwoot
Expand Down
4 changes: 2 additions & 2 deletions deployment/setup_20.04.sh
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@ RAILS_ENV=production
sudo -i -u chatwoot << EOF
rvm --version
rvm autolibs disable
rvm install "ruby-2.7.1"
rvm use 2.7.1 --default
rvm install "ruby-2.7.2"
rvm use 2.7.2 --default
git clone https://github.com/chatwoot/chatwoot.git
cd chatwoot
Expand Down
4 changes: 2 additions & 2 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# pre-build stage
FROM ruby:2.7.1-alpine AS pre-builder
FROM ruby:2.7.2-alpine AS pre-builder

# ARG default to production settings
# For development docker-compose file overrides ARGS
Expand Down Expand Up @@ -51,7 +51,7 @@ RUN if [ "$RAILS_ENV" = "production" ]; then \
fi

# final build stage
FROM ruby:2.7.1-alpine
FROM ruby:2.7.2-alpine

ARG BUNDLE_WITHOUT="development:test"
ENV BUNDLE_WITHOUT ${BUNDLE_WITHOUT}
Expand Down
8 changes: 4 additions & 4 deletions docs/development/environment-setup/mac-os.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,19 +37,19 @@ source ~/.rvm/scripts/rvm

### Install Ruby

Chatwoot APIs are built on Ruby on Rails, you need install ruby 2.7.1
Chatwoot APIs are built on Ruby on Rails, you need install ruby 2.7.2

If you are using `rvm` :

```bash
rvm install ruby-2.7.1
rvm use 2.7.1
rvm install ruby-2.7.2
rvm use 2.7.2
```

If you are using `rbenv` to manage ruby versions do :

```bash
rbenv install 2.7.1
rbenv install 2.7.2
```

`rbenv` identifies the ruby version from `.ruby-version` file on the root of the project and loads it automatically.
Expand Down
8 changes: 4 additions & 4 deletions docs/development/environment-setup/ubuntu.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,16 +33,16 @@ Enable `Run command as a login shell` in terminal `Preferences`. Restart your co

### Install Ruby

Chatwoot APIs are built on Ruby on Rails. You need to install ruby 2.7.1:
Chatwoot APIs are built on Ruby on Rails. You need to install ruby 2.7.2:

```bash
rvm install ruby-2.7.1
rvm install ruby-2.7.2
```

Use ruby 2.7.1 as default:
Use ruby 2.7.2 as default:

```bash
rvm use 2.7.1 --default
rvm use 2.7.2 --default
```

### Install Node.js
Expand Down
6 changes: 3 additions & 3 deletions docs/development/environment-setup/windows.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,15 @@ sudo apt-get update
sudo apt-get install git-core curl zlib1g-dev build-essential libssl-dev libreadline-dev libyaml-dev libsqlite3-dev sqlite3 libxml2-dev libxslt1-dev libcurl4-openssl-dev software-properties-common libffi-dev
```

Install RVM & ruby version 2.7.1
Install RVM & ruby version 2.7.2

```bash
sudo apt-get install libgdbm-dev libncurses5-dev automake libtool bison libffi-dev
gpg --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB
curl -sSL https://get.rvm.io | bash -s stable
source ~/.rvm/scripts/rvm
rvm install 2.7.1
rvm use 2.7.1 --default
rvm install 2.7.2
rvm use 2.7.2 --default
ruby -v
```

Expand Down

0 comments on commit 61d26f7

Please sign in to comment.