From 10e68f34536873cc8d046d17b74d3d4a12614c98 Mon Sep 17 00:00:00 2001 From: Tocho Tochev Date: Sun, 22 Sep 2024 22:44:30 +0300 Subject: [PATCH] Use ruby 3.3.5 in all places --- .ruby-version | 2 +- .travis.yml | 2 +- Dockerfile | 2 +- README.md | 10 ++++++---- config/deploy.rb | 2 +- 5 files changed, 10 insertions(+), 8 deletions(-) diff --git a/.ruby-version b/.ruby-version index 619b537..fa7adc7 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -3.3.3 +3.3.5 diff --git a/.travis.yml b/.travis.yml index f4ecf55..0a27c75 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,7 +2,7 @@ language: ruby dist: xenial cache: bundler rvm: - - 2.6 + - 3.3 script: - RAILS_ENV=test bundle exec rake --trace bootstrap spec addons: diff --git a/Dockerfile b/Dockerfile index 4ed46a0..f075b65 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ # syntax = docker/dockerfile:1 # Make sure RUBY_VERSION matches the Ruby version in .ruby-version and Gemfile -ARG RUBY_VERSION=3.3.0 +ARG RUBY_VERSION=3.3.5 FROM registry.docker.com/library/ruby:$RUBY_VERSION-slim as base # Rails app lives here diff --git a/README.md b/README.md index 66f9a3e..5a84df3 100644 --- a/README.md +++ b/README.md @@ -6,9 +6,11 @@ A CfP automation system for OpenFest. ### For local development -1. `git clone https://github.com/ignisf/clarion.git` -2. Run `bundle install; bin/rake bootstrap` -3. You can now run the rails server with `bin/rails s` +1. `git clone https://git.openfest.org/Site/clarion/` +2. Run `rvm install "ruby-$(cat .ruby-version)"; rvm install "ruby-$(cat .ruby-version)"` +3. Start up postgresql +4. Run `bundle install; bin/rake bootstrap` +5. You can now run the rails server with `bin/rails s` ### For production @@ -25,5 +27,5 @@ Note that the docker image contains a default user (for credentials see `db/seed 1. Go to `http://127.0.0.1:3000/management/` 2. Login (for initial creds see `db/seeds.rb`) 3. Change the credentials -3. Create a conference. +4. Create a conference. - NB: When creating a conference make sure to use the same `domain` as the one you are currently using, otherwise nothing will be shown. diff --git a/config/deploy.rb b/config/deploy.rb index 248415f..4778778 100644 --- a/config/deploy.rb +++ b/config/deploy.rb @@ -39,7 +39,7 @@ set :linked_dirs, fetch(:linked_dirs, []).push("log", "tmp/uploads", "tmp/pids", # Default value for keep_releases is 5 set :keep_releases, 550 -set :rvm_ruby_version, "2.6.5" +set :rvm_ruby_version, "3.3.5" set :puma_bind, ["tcp://127.0.0.1:9087"] set :puma_init_active_record, true