code-dot-org · snickell · Jan 9, 2025 · Aug 10, 2024 · Aug 10, 2024 · Aug 10, 2024
@@ -82,7 +82,7 @@ steps:
   - name: unit-tests
     # see: docker/ci/Dockerfile
     # TODO: switch to codedotorg/cdo-ci
-    image: codedotorg/code-dot-org:1.11.1
+    image: codedotorg/code-dot-org:1.12.0
     pull: always
     volumes:
       - name: rbenv
@@ -215,7 +215,7 @@ steps:
   - name: ui-tests
     # see: docker/ci/Dockerfile
     # TODO: switch to codedotorg/cdo-ci
-    image: codedotorg/code-dot-org:1.11.1
+    image: codedotorg/code-dot-org:1.12.0
     pull: always
     volumes:
       - name: rbenv
@@ -316,6 +316,6 @@ trigger:
     - push
 ---
 kind: signature
-hmac: 38a0cef75d2449a37668b441e20c4d71ab55a1809191b792fc7b2e6297f57ddb
+hmac: 063d3b4aaab5a570c1034ac66e8b896a0366e39854d6b117a0faae520251e74d
 
 ...
@@ -1 +1 @@
-3.0.5
+3.3.4
diff --git a/Gemfile b/Gemfile
@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
-ruby '3.0.5'
+ruby '3.3.4'
 
 # Ruby 2.7 no longer includes some libraries by default; install
 # the ones we need here

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1135,7 +1135,7 @@ DEPENDENCIES
   youtube-dl.rb
 
 RUBY VERSION
-   ruby 3.0.5p211
+   ruby 3.3.4p94
 
 BUNDLED WITH
-   2.3.22
+   2.5.17
diff --git a/bin/test/i18n/test_i18n_script_utils.rb b/bin/test/i18n/test_i18n_script_utils.rb
@@ -60,7 +60,7 @@
     let(:to_crowdin_yaml) {described_class.to_crowdin_yaml(to_crowdin_yaml_data)}
 
     let(:to_crowdin_yaml_data) {{en: {'test' => '#example', 'yes' => 'y'}}}
-    let(:to_crowdin_yaml_output) {"---\n:en:\n  test: \"#example\"\n  'yes': 'y'\n"}
+    let(:to_crowdin_yaml_output) {"---\n:en:\n  test: \"#example\"\n  'yes': \"y\"\n"}
 
     it 'returns correctly formatted yaml' do
       _(to_crowdin_yaml).must_equal to_crowdin_yaml_output

@@ -1 +1 @@
-3.0.5
+3.3.4
@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
-ruby '3.0.5'
+ruby '3.3.4'
 
 gem 'berkshelf'
 gem 'chef', '17.6.18'

@@ -800,7 +800,7 @@ DEPENDENCIES
   test-kitchen
 
 RUBY VERSION
-   ruby 3.0.5p211
+   ruby 3.3.4p94
 
 BUNDLED WITH
-   2.3.22
+   2.5.17
@@ -12,5 +12,4 @@ This cookbook uses [`ruby-build`](https://github.com/rbenv/ruby-build#readme) in
 
 - `node['cdo-ruby']['version']`: Ruby version. See `ruby-build --definitions` for available options
 - `node['cdo-ruby']['rubygems_version']`: Updates the version of [RubyGems](https://rubygems.org/) installed.
-- `node['cdo-ruby']['bundler_version']`: Updates the version of [Bundler](http://bundler.io/) installed.
 - `node['cdo-ruby']['rake_version']`: Updates the version of [Rake](https://ruby.github.io/rake/) installed.
@@ -1,6 +1,5 @@
 default['cdo-ruby'] = {
-  version: '3.0.5',
-  rubygems_version: '3.3.22',
-  bundler_version: '2.3.22',
-  rake_version: '13.0.1'
+  version: '3.3.4',
+  rubygems_version: '3.5.17 ',
+  rake_version: '13.2.1'
 }
@@ -2,11 +2,6 @@
 include_recipe 'apt'
 apt_package 'git'
 
-gem_package 'bundler' do
-  action :upgrade
-  version node['cdo-ruby']['bundler_version']
-end
-
 template "#{node[:home]}/.gemrc" do
   source 'gemrc.erb'
   user node[:user]

@@ -6,14 +6,14 @@
 
 # Arbitrarily use the latest version of ruby build at time this code was
 # written; this probably doesn't matter, but we need to pick something.
-RUBY_BUILD_VERSION = '20221225'.freeze
+RUBY_BUILD_VERSION = '20240727'.freeze
 
-remote_file '/tmp/ruby-build.tar.gz' do
+remote_file "/tmp/ruby-build-#{RUBY_BUILD_VERSION}.tar.gz" do
   source "https://github.com/rbenv/ruby-build/archive/refs/tags/v#{RUBY_BUILD_VERSION}.tar.gz"
   action :create_if_missing
 end
 
-archive_file '/tmp/ruby-build.tar.gz' do
+archive_file "/tmp/ruby-build-#{RUBY_BUILD_VERSION}.tar.gz" do
   destination '/tmp/ruby-build'
   overwrite :auto
 end
@@ -25,7 +25,8 @@
 end
 
 # Install dependencies require for ruby-build to succeed
-apt_package %w(zlib1g-dev)
+# List taken from: https://github.com/rbenv/ruby-build/wiki#ubuntudebianmint
+apt_package %w(autoconf patch build-essential rustc libssl-dev libyaml-dev libreadline6-dev zlib1g-dev libgmp-dev libncurses5-dev libffi-dev libgdbm6 libgdbm-dev libdb-dev uuid-dev)
 
 execute 'install ruby with ruby build' do
   # Target /usr/local; it might make sense to install ruby itself to /usr as

@@ -1,6 +1,6 @@
 require_relative '../../../shared/helper_spec'
 
 file_exist '/usr/local/bin/ruby'
-cmd 'ruby -v', '3.0.5'
-cmd 'gem -v', '3.3.22'
-cmd 'bundler -v', '2.3.22'
+cmd 'ruby -v', '3.3.4'
+cmd 'gem -v', '3.5.17'
+cmd 'bundler -v', '2.5.17'
diff --git a/dashboard/config/application.rb b/dashboard/config/application.rb
@@ -22,6 +22,11 @@
 # can be automatically loaded just below.
 require 'cdo/pycall'
 
+# Monkey patch the `state_machine` gem (a dependency of `eyes_selenium`) to
+# support Ruby >= 3.2. This gem was replaced with `state_machines` in
+# `eyes_selenium` v6.0.4, so the patch can be removed once we upgrade.
+require_relative 'monkeypatch_state_machine'
+
 # Require the gems listed in Gemfile, including any gems
 # you've limited to :test, :development, or :production.
 Bundler.require(:default, Rails.env)

diff --git a/dashboard/config/monkeypatch_state_machine.rb b/dashboard/config/monkeypatch_state_machine.rb
@@ -0,0 +1,25 @@
+# Monkey patch the `state_machine` gem (a dependency of `eyes_selenium`) to
+# support Ruby >= 3.2. This gem was replaced with `state_machines` in
+# `eyes_selenium` v6.0.4, so the patch can be removed once we upgrade.
+begin
+  require 'state_machine/integrations/base'
+
+  module StateMachine
+    module Integrations
+      module Base
+        module ClassMethods
+          # Patch the original `locale_path` method; replace deprecated
+          # `File.exists?` with modern `File.exist?`
+          #
+          # See https://github.com/pluginaweek/state_machine/blob/v1.2.0/lib/state_machine/integrations/base.rb#L78C24-L82C12
+          def locale_path
+            path = "#{File.dirname(__FILE__)}/#{integration_name}/locale.rb"
+            path if File.exist?(path)
+          end
+        end
+      end
+    end
+  end
+rescue LoadError
+  # state_machine gem is only installed in test and development environments
+end
diff --git a/docker/README.md b/docker/README.md
@@ -82,7 +82,7 @@ docker login -u codedotorg
 Build a full image to your local machine
 
 ```
-docker build .
+docker build --platform=linux/amd64 .
 ```
 
 **Note:** We are moving to a new naming convention in order to use different docker images for different purposes. What was the `code-dot-org` image will become the `cdo-ci` image. For now, these docs advise publishing both names.

@@ -59,12 +59,8 @@ USER ${USER}
 
 RUN mkdir -p "$(rbenv root)"/plugins && \
     git clone https://github.com/rbenv/ruby-build.git "$(rbenv root)"/plugins/ruby-build && \
-    rbenv install 3.0.5 && \
-    eval "$(rbenv init -)" && \
-    rbenv shell 3.0.5 && \
-    rbenv rehash && \
-    gem install bundler -v 2.3.22
-
+    rbenv install 3.3.4 && \
+    eval "$(rbenv init -)"
 
 #########################################################
 FROM base as primary-layer

diff --git a/docker/setup-compose.yml b/docker/setup-compose.yml
@@ -14,7 +14,7 @@ version: "3"
 services:
   site:
     # TODO: switch to codedotorg/cdo-ci or other new image
-    image: codedotorg/code-dot-org:1.11.1
+    image: codedotorg/code-dot-org:1.12.0
     user: ${FIXUID:-1000}:${FIXGID:-1000}
     volumes:
       - ../:/home/ci/code-dot-org:delegated

diff --git a/docker/site-compose.yml b/docker/site-compose.yml
@@ -17,7 +17,7 @@ version: "3"
 services:
   site:
     # TODO: switch to codedotorg/cdo-ci or other new image
-    image: codedotorg/code-dot-org:1.11.1
+    image: codedotorg/code-dot-org:1.12.0
     user: ${FIXUID:-1000}:${FIXGID:-1000}
     volumes:
       - ../:/home/ci/code-dot-org:delegated

diff --git a/docker/ui-tests-compose.yml b/docker/ui-tests-compose.yml
@@ -23,7 +23,7 @@ version: "3"
 services:
   site:
     # TODO: switch to codedotorg/cdo-ci or other new image
-    image: codedotorg/code-dot-org:1.11.1
+    image: codedotorg/code-dot-org:1.12.0
     user: ${FIXUID:-1000}:${FIXGID:-1000}
     volumes:
       - ../:/home/ci/code-dot-org:delegated

diff --git a/docker/unit-tests-compose.yml b/docker/unit-tests-compose.yml
@@ -20,7 +20,7 @@ version: "3"
 services:
   site:
     # TODO: switch to codedotorg/cdo-ci or other new image
-    image: codedotorg/code-dot-org:1.11.1
+    image: codedotorg/code-dot-org:1.12.0
     user: ${FIXUID:-1000}:${FIXGID:-1000}
     volumes:
       - ../:/home/ci/code-dot-org:delegated