Skip to content
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
16 changes: 15 additions & 1 deletion .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,2 +1,16 @@
FROM mcr.microsoft.com/devcontainers/ruby:dev-3.3-bookworm
FROM mcr.microsoft.com/devcontainers/ruby:dev-4.0-bookworm
RUN apt-get update && apt-get install -y vim curl gpg postgresql postgresql-contrib tzdata imagemagick

# The dev-4.0 tag tracks the latest Ruby 4.0.x patch, which may not match the
# exact version pinned in .ruby-version. If it doesn't, install the pinned
# version via rvm so Bundler is happy. When patch versions align, this is a
# no-op and the build stays fast.
USER vscode
COPY --chown=vscode:vscode .ruby-version /tmp/.ruby-version
RUN /bin/bash -lc '\
pinned="$(cat /tmp/.ruby-version)"; \
if ! ruby -v | grep -q "ruby $pinned"; then \
rvm install "$pinned" && rvm --default use "$pinned"; \
fi' \
&& rm /tmp/.ruby-version
USER root
4 changes: 2 additions & 2 deletions .devcontainer/post-create.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ RUBY_VERSION="$(cat .ruby-version | tr -d '\n')"
# copy the file only if it doesn't already exist
cp -n .devcontainer/.env.codespaces .env

# If the project's required ruby version changes from 4.0.2, this command
# If the project's required ruby version changes from 4.0.3, this command
# will download and compile the correct version, but it will take a long time.
if [ "$RUBY_VERSION" != "4.0.2" ]; then
if [ "$RUBY_VERSION" != "4.0.3" ]; then
rvm install $RUBY_VERSION
rvm use $RUBY_VERSION
echo "Ruby $RUBY_VERSION installed"
Expand Down
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
4.0.2
4.0.3
2 changes: 1 addition & 1 deletion .tool-versions
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
ruby 4.0.2
ruby 4.0.3
nodejs 24.13.0
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ ARG ROOT=/usr/src/app/

FROM node:24-alpine AS node-source

FROM ruby:4.0.2-alpine AS build
FROM ruby:4.0.3-alpine AS build
ARG ROOT
WORKDIR $ROOT

Expand All @@ -22,7 +22,7 @@ RUN bundle config set force_ruby_platform true
COPY Gemfile* $ROOT
RUN bundle install

FROM ruby:4.0.2-alpine
FROM ruby:4.0.3-alpine
ARG ROOT
WORKDIR $ROOT

Expand Down
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

source "https://rubygems.org"

ruby "4.0.2"
ruby "4.0.3"
gem "rails", "~> 7.2"

gem "after_party" # Post-deployment tasks
Expand Down
4 changes: 2 additions & 2 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -802,7 +802,7 @@ DEPENDENCIES
wicked

RUBY VERSION
ruby 4.0.2
ruby 4.0.3

BUNDLED WITH
4.0.9
4.0.6
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ The complete [role description of a CASA volunteer](https://pgcasa.org/volunteer

| Technology | Version |
|---|---|
| Ruby | 4.0.2 (see `.ruby-version`) |
| Ruby | 4.0.3 (see `.ruby-version`) |
| Rails | 7.2 |
| PostgreSQL | 14+ |
| Node.js | LTS/Krypton (see `.nvmrc`) |
Expand Down Expand Up @@ -131,7 +131,7 @@ Key libraries: [Hotwire Turbo](https://turbo.hotwired.dev/), [Stimulus](https://

**Ruby**
1. Install a ruby version manager: [rvm](https://rvm.io/) or [rbenv](https://github.com/rbenv/rbenv)
1. when you cd into the project directory, let your version manager install the ruby version in `.ruby-version`. Right now that's Ruby 4.0.2
1. when you cd into the project directory, let your version manager install the ruby version in `.ruby-version`. Right now that's Ruby 4.0.3
1. `gem install bundler`

**node.js**
Expand Down
6 changes: 4 additions & 2 deletions bin/setup
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,10 @@ FileUtils.chdir APP_ROOT do

puts "\n== Installing dependencies =="
system! 'gem install foreman'
system! 'gem install bundler --conservative'
system!('bundle update --bundler --verbose')
# Pin bundler to a version Heroku supports for our Ruby. Match Heroku's
# supported Ruby/Bundler pairings as they evolve:
# https://devcenter.heroku.com/articles/ruby-support-reference#supported-ruby-versions
system! 'gem install bundler -v 4.0.6 --conservative'
system!('bundle check') || system!('bundle install')

# puts '\n== Copying sample files =='
Expand Down
8 changes: 4 additions & 4 deletions doc/LINUX_SETUP.md
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ git clone https://github.com/rbenv/rbenv.git ~/.rbenv
# fetch list of ruby versions
git clone https://github.com/rbenv/ruby-build.git "$(rbenv root)"/plugins/ruby-build

rbenv install 4.0.2
rbenv install 4.0.3
```

If you would like RVM instead of rbenv
Expand All @@ -95,9 +95,9 @@ gpg --keyserver hkp://pool.sks-keyservers.net --recv-keys 409B6B1796C275462A1703
\curl -sSL https://get.rvm.io | bash
. ./.bashrc
rvm get head
rvm install 4.0.2
rvm alias create ruby 4.0.2
rvm alias create default ruby-4.0.2
rvm install 4.0.3
rvm alias create ruby 4.0.3
rvm alias create default ruby-4.0.3
```

```# Download the Chrome browser (for RSpec testing):
Expand Down
8 changes: 4 additions & 4 deletions doc/MAC_SETUP.md
Original file line number Diff line number Diff line change
Expand Up @@ -56,17 +56,17 @@ Next, install the version of Ruby that this project uses. This can be found by c
To install the appropriate ruby version, run:

```bash
rbenv install 4.0.2
rbenv install 4.0.3
```

(Do not forget to switch 4.0.2 to the appropriate version)
(Do not forget to switch 4.0.3 to the appropriate version)

Finally, run:

```bash
rbenv local 4.0.2
rbenv local 4.0.3
```
(Do not forget to switch 4.0.2 to the appropriate version)
(Do not forget to switch 4.0.3 to the appropriate version)

## Nodejs

Expand Down
8 changes: 4 additions & 4 deletions doc/WSL_SETUP.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ You will need the following local tools installed:

Install a ruby version manager like [rbenv](https://github.com/rbenv/rbenv#installation)

**Be sure to install the ruby version in `.ruby-version`. Right now that's Ruby 4.0.2.**
**Be sure to install the ruby version in `.ruby-version`. Right now that's Ruby 4.0.3.**

Instructions for rbenv:

Expand All @@ -48,13 +48,13 @@ Instructions for rbenv:

5. **[Install Ruby](https://github.com/rbenv/rbenv#installing-ruby-versions)**

**Be sure to install the ruby version in `.ruby-version`. Right now that's Ruby 4.0.2.**
**Be sure to install the ruby version in `.ruby-version`. Right now that's Ruby 4.0.3.**

`rbenv install 4.0.2`
`rbenv install 4.0.3`

6. **Set a Ruby version to finish installation and start**

`rbenv global 4.0.2` OR `rbenv local 4.0.2`
`rbenv global 4.0.3` OR `rbenv local 4.0.3`

#### Troubleshooting
If you are on Ubuntu in Windows Subsystem for Linux (WSL) and `rbenv install` indicates that the Ruby version is unavailable, you might be using Ubuntu's default install of `ruby-build`, which only comes with old installs of Ruby (ending before 2.6.) You should uninstall rvm and ruby-build's apt packages (`apt remove rvm ruby-build`) and install them with Git like this:
Expand Down
2 changes: 1 addition & 1 deletion flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@

gemConfig = { };
# See available versions here: https://github.com/bobvanderlinden/nixpkgs-ruby/blob/master/ruby/versions.json
ruby = pkgs."ruby-4.0.2";
ruby = pkgs."ruby-4.0.3";

bundixcli = bundix.packages.${system}.default;
in rec {
Expand Down
Loading