Skip to content

Commit

Permalink
Merge branch '8031-drop-ruby-3.0' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
gbp committed Aug 14, 2024
2 parents 2b321c6 + 02fcd6f commit 6f70e22
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .ruby-version.example
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.0.4
3.1.6
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ Every Alaveteli commit is tested by GitHub Actions on the [following Ruby platfo
* ruby-3.1
* ruby-3.2

If you use a ruby version management tool (such as RVM or .rbenv) and want to use the default development version used by the Alaveteli team (currently 3.0.4), you can create a `.ruby-version` symlink with a target of `.ruby-version.example` to switch to that automatically in the project directory.
If you use a ruby version management tool (such as RVM or .rbenv) and want to use the default development version used by the Alaveteli team (currently 3.1.6), you can create a `.ruby-version` symlink with a target of `.ruby-version.example` to switch to that automatically in the project directory.

## How to contribute

Expand Down
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ services:
context: .
dockerfile: docker/Dockerfile
args:
RUBY_VERSION: '${RUBY_VERSION:-3.0}'
RUBY_VERSION: '${RUBY_VERSION:-3.1}'
tty: true
stdin_open: true
environment:
Expand Down
8 changes: 4 additions & 4 deletions lib/tasks/config_files.rake
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ namespace :config_files do
cpus: ENV.fetch('CPUS') { '1' },
mailto: ENV.fetch('MAILTO') { "#{ ENV['DEPLOY_USER'] }@localhost" },
rails_env: ENV.fetch('RAILS_ENV') { 'development' },
ruby_version: ENV.fetch('RUBY_VERSION') { '3.1.5' },
ruby_version: ENV.fetch('RUBY_VERSION') { '3.1.6' },
site: ENV.fetch('SITE') { 'foi' },
user: ENV.fetch('DEPLOY_USER') { 'alaveteli' },
vcspath: ENV.fetch('VCSPATH') { 'alaveteli' },
Expand Down Expand Up @@ -123,7 +123,7 @@ namespace :config_files do
'VCSPATH=alaveteli ' \
'SITE=alaveteli ' \
'SCRIPT_FILE=config/sysvinit-thin.example ' \
'RUBY_VERSION=3.1.5 ' \
'RUBY_VERSION=3.1.6 ' \
'USE_RBENV=false '
check_for_env_vars(%w[DEPLOY_USER VHOST_DIR SCRIPT_FILE], example)

Expand All @@ -147,7 +147,7 @@ namespace :config_files do
'VCSPATH=alaveteli ' \
'SITE=alaveteli ' \
'DAEMON=alert-tracks.service ' \
'RUBY_VERSION=3.1.5 ' \
'RUBY_VERSION=3.1.6 ' \
'USE_RBENV=false '
check_for_env_vars(%w[DEPLOY_USER VHOST_DIR DAEMON], example)

Expand All @@ -167,7 +167,7 @@ namespace :config_files do
'VHOST_DIR=/dir/above/alaveteli VCSPATH=alaveteli ' \
'SITE=alaveteli CRONTAB=config/crontab-example ' \
'[email protected] ' \
'RUBY_VERSION=3.1.5 ' \
'RUBY_VERSION=3.1.6 ' \
'USE_RBENV=false '
check_for_env_vars(%w[DEPLOY_USER VHOST_DIR VCSPATH SITE CRONTAB], example)
convert_erb(ENV['CRONTAB'], **default_replacements)
Expand Down

0 comments on commit 6f70e22

Please sign in to comment.