diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 77413192..dd5c944d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -34,7 +34,7 @@ jobs: - uses: actions/checkout@v3 - uses: ruby/setup-ruby@v1 with: - ruby-version: 3.3 + ruby-version: 3.2 bundler-cache: true - uses: actions/setup-node@v3 with: diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 1b273aae..4433b3e1 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -18,7 +18,7 @@ jobs: - uses: actions/checkout@v3 - uses: ruby/setup-ruby@v1 with: - ruby-version: 3.3 + ruby-version: 3.2 bundler-cache: true - name: Deploy to demo run: bundle exec kamal deploy -P --version=edge diff --git a/.ruby-version b/.ruby-version index 15a27998..be94e6f5 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -3.3.0 +3.2.2 diff --git a/Dockerfile b/Dockerfile index 86fe2511..a1592a0e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ FROM node:18.12.1-alpine AS node -FROM ruby:3.3.0-alpine AS base +FROM ruby:3.2.2-alpine AS base FROM base AS builder ENV RAILS_ENV production diff --git a/Gemfile.lock b/Gemfile.lock index ce779a24..50f97e01 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,71 +1,70 @@ GEM remote: https://rubygems.org/ specs: - actioncable (7.1.3) - actionpack (= 7.1.3) - activesupport (= 7.1.3) + actioncable (7.1.1) + actionpack (= 7.1.1) + activesupport (= 7.1.1) nio4r (~> 2.0) websocket-driver (>= 0.6.1) zeitwerk (~> 2.6) - actionmailbox (7.1.3) - actionpack (= 7.1.3) - activejob (= 7.1.3) - activerecord (= 7.1.3) - activestorage (= 7.1.3) - activesupport (= 7.1.3) + actionmailbox (7.1.1) + actionpack (= 7.1.1) + activejob (= 7.1.1) + activerecord (= 7.1.1) + activestorage (= 7.1.1) + activesupport (= 7.1.1) mail (>= 2.7.1) net-imap net-pop net-smtp - actionmailer (7.1.3) - actionpack (= 7.1.3) - actionview (= 7.1.3) - activejob (= 7.1.3) - activesupport (= 7.1.3) + actionmailer (7.1.1) + actionpack (= 7.1.1) + actionview (= 7.1.1) + activejob (= 7.1.1) + activesupport (= 7.1.1) mail (~> 2.5, >= 2.5.4) net-imap net-pop net-smtp rails-dom-testing (~> 2.2) - actionpack (7.1.3) - actionview (= 7.1.3) - activesupport (= 7.1.3) + actionpack (7.1.1) + actionview (= 7.1.1) + activesupport (= 7.1.1) nokogiri (>= 1.8.5) - racc rack (>= 2.2.4) rack-session (>= 1.0.1) rack-test (>= 0.6.3) rails-dom-testing (~> 2.2) rails-html-sanitizer (~> 1.6) - actiontext (7.1.3) - actionpack (= 7.1.3) - activerecord (= 7.1.3) - activestorage (= 7.1.3) - activesupport (= 7.1.3) + actiontext (7.1.1) + actionpack (= 7.1.1) + activerecord (= 7.1.1) + activestorage (= 7.1.1) + activesupport (= 7.1.1) globalid (>= 0.6.0) nokogiri (>= 1.8.5) - actionview (7.1.3) - activesupport (= 7.1.3) + actionview (7.1.1) + activesupport (= 7.1.1) builder (~> 3.1) erubi (~> 1.11) rails-dom-testing (~> 2.2) rails-html-sanitizer (~> 1.6) - activejob (7.1.3) - activesupport (= 7.1.3) + activejob (7.1.1) + activesupport (= 7.1.1) globalid (>= 0.3.6) - activemodel (7.1.3) - activesupport (= 7.1.3) - activerecord (7.1.3) - activemodel (= 7.1.3) - activesupport (= 7.1.3) + activemodel (7.1.1) + activesupport (= 7.1.1) + activerecord (7.1.1) + activemodel (= 7.1.1) + activesupport (= 7.1.1) timeout (>= 0.4.0) - activestorage (7.1.3) - actionpack (= 7.1.3) - activejob (= 7.1.3) - activerecord (= 7.1.3) - activesupport (= 7.1.3) + activestorage (7.1.1) + actionpack (= 7.1.1) + activejob (= 7.1.1) + activerecord (= 7.1.1) + activesupport (= 7.1.1) marcel (~> 1.0) - activesupport (7.1.3) + activesupport (7.1.1) base64 bigdecimal concurrent-ruby (~> 1.0, >= 1.0.2) @@ -77,11 +76,11 @@ GEM tzinfo (~> 2.0) acts_as_list (1.1.0) activerecord (>= 4.2) - addressable (2.8.6) + addressable (2.8.5) public_suffix (>= 2.0.2, < 6.0) ast (2.4.2) - base64 (0.2.0) - bcrypt (3.1.20) + base64 (0.1.1) + bcrypt (3.1.19) bcrypt_pbkdf (1.1.0) better_html (2.0.2) actionview (>= 6.0) @@ -90,13 +89,13 @@ GEM erubi (~> 1.4) parser (>= 2.4) smart_properties - bigdecimal (3.1.6) + bigdecimal (3.1.4) bindex (0.8.1) - bootsnap (1.17.1) + bootsnap (1.17.0) msgpack (~> 1.2) browser (5.3.1) builder (3.2.4) - bullet (7.1.6) + bullet (7.1.2) activesupport (>= 3.0.0) uniform_notifier (~> 1.11) capybara (3.39.2) @@ -108,10 +107,9 @@ GEM rack-test (>= 0.6.3) regexp_parser (>= 1.5, < 3.0) xpath (~> 3.2) - concurrent-ruby (1.2.3) + concurrent-ruby (1.2.2) connection_pool (2.4.1) - crack (0.4.6) - bigdecimal + crack (0.4.5) rexml crass (1.0.6) cssbundling-rails (1.2.0) @@ -120,13 +118,13 @@ GEM capybara (~> 3.0) ferrum (~> 0.13.0) daemons (1.4.1) - date (3.3.4) - debug (1.9.1) - irb (~> 1.10) - reline (>= 0.3.8) + date (3.3.3) + debug (1.8.0) + irb (>= 1.5.0) + reline (>= 0.3.1) docile (1.4.0) dotenv (2.8.1) - drb (2.2.0) + drb (2.1.1) ruby2_keywords ed25519 (1.3.0) erb_lint (0.4.0) @@ -145,12 +143,14 @@ GEM ffi (1.16.3) globalid (1.2.1) activesupport (>= 6.1) - hanami-router (2.0.2) - mustermann (~> 3.0) - mustermann-contrib (~> 3.0) - rack (~> 2.0) - hansi (0.2.1) - hashdiff (1.1.0) + hanami-router (0.6.2) + hanami-utils (~> 0.7) + http_router (~> 0.11) + hanami-utils (0.9.2) + hashdiff (1.0.1) + http_router (0.11.2) + rack (>= 1.0.0) + url_mount (~> 0.2.1) httparty (0.21.0) mini_mime (>= 1.0.0) multi_xml (>= 0.5.2) @@ -159,16 +159,16 @@ GEM image_processing (1.12.2) mini_magick (>= 4.9.5, < 5) ruby-vips (>= 2.0.17, < 3) - io-console (0.7.2) - irb (1.11.1) + io-console (0.6.0) + irb (1.8.3) rdoc - reline (>= 0.4.2) + reline (>= 0.3.8) jbuilder (2.11.5) actionview (>= 5.0.0) activesupport (>= 5.0.0) jsbundling-rails (1.1.2) railties (>= 6.0.0) - json (2.7.1) + json (2.6.3) kamal (0.16.1) activesupport (>= 7.0) bcrypt_pbkdf (~> 1.0) @@ -191,7 +191,7 @@ GEM rack sqlite3 tilt - loofah (2.22.0) + loofah (2.21.4) crass (~> 1.0.2) nokogiri (>= 1.12.0) mail (2.8.1) @@ -204,47 +204,32 @@ GEM memory_profiler (0.9.14) mini_magick (4.12.0) mini_mime (1.1.5) - minitest (5.22.0) + mini_portile2 (2.8.5) + minitest (5.20.0) msgpack (1.7.2) multi_xml (0.6.0) - mustermann (3.0.0) - ruby2_keywords (~> 0.0.1) - mustermann-contrib (3.0.0) - hansi (~> 0.2.0) - mustermann (= 3.0.0) - mutex_m (0.2.0) - net-imap (0.4.10) + mutex_m (0.1.2) + net-imap (0.4.3) date net-protocol net-pop (0.1.2) net-protocol - net-protocol (0.2.2) + net-protocol (0.2.1) timeout net-scp (4.0.0) net-ssh (>= 2.6.5, < 8.0.0) - net-sftp (4.0.0) - net-ssh (>= 5.0.0, < 8.0.0) - net-smtp (0.4.0.1) + net-smtp (0.4.0) net-protocol - net-ssh (7.2.1) - nio4r (2.7.0) - nokogiri (1.16.2-aarch64-linux) - racc (~> 1.4) - nokogiri (1.16.2-arm-linux) - racc (~> 1.4) - nokogiri (1.16.2-arm64-darwin) - racc (~> 1.4) - nokogiri (1.16.2-x86-linux) - racc (~> 1.4) - nokogiri (1.16.2-x86_64-darwin) - racc (~> 1.4) - nokogiri (1.16.2-x86_64-linux) + net-ssh (7.2.0) + nio4r (2.5.9) + nokogiri (1.15.4) + mini_portile2 (~> 2.8.2) racc (~> 1.4) oj (3.16.3) bigdecimal (>= 3.0) pagy (6.0.4) - parallel (1.24.0) - parser (3.3.0.5) + parallel (1.23.0) + parser (3.2.2.4) ast (~> 2.4.1) racc pg (1.5.4) @@ -253,34 +238,34 @@ GEM activesupport (>= 7.0.0) rack railties (>= 7.0.0) - psych (5.1.2) + psych (5.1.1.1) stringio - public_suffix (5.0.4) - puma (6.4.2) + public_suffix (5.0.3) + puma (6.4.0) nio4r (~> 2.0) - racc (1.7.3) - rack (2.2.8) - rack-session (1.0.2) - rack (< 3) + racc (1.7.1) + rack (3.0.8) + rack-session (2.0.0) + rack (>= 3.0.0) rack-test (2.1.0) rack (>= 1.3) - rackup (1.0.0) - rack (< 3) - webrick - rails (7.1.3) - actioncable (= 7.1.3) - actionmailbox (= 7.1.3) - actionmailer (= 7.1.3) - actionpack (= 7.1.3) - actiontext (= 7.1.3) - actionview (= 7.1.3) - activejob (= 7.1.3) - activemodel (= 7.1.3) - activerecord (= 7.1.3) - activestorage (= 7.1.3) - activesupport (= 7.1.3) + rackup (2.1.0) + rack (>= 3) + webrick (~> 1.8) + rails (7.1.1) + actioncable (= 7.1.1) + actionmailbox (= 7.1.1) + actionmailer (= 7.1.1) + actionpack (= 7.1.1) + actiontext (= 7.1.1) + actionview (= 7.1.1) + activejob (= 7.1.1) + activemodel (= 7.1.1) + activerecord (= 7.1.1) + activestorage (= 7.1.1) + activesupport (= 7.1.1) bundler (>= 1.15.0) - railties (= 7.1.3) + railties (= 7.1.1) rails-dom-testing (2.2.0) activesupport (>= 5.0.0) minitest @@ -288,9 +273,9 @@ GEM rails-html-sanitizer (1.6.0) loofah (~> 2.21) nokogiri (~> 1.14) - railties (7.1.3) - actionpack (= 7.1.3) - activesupport (= 7.1.3) + railties (7.1.1) + actionpack (= 7.1.1) + activesupport (= 7.1.1) irb rackup (>= 1.0.0) rake (>= 12.2) @@ -305,10 +290,10 @@ GEM rb-fsevent (0.11.2) rb-inotify (0.10.1) ffi (~> 1.0) - rdoc (6.6.2) + rdoc (6.5.0) psych (>= 4.0.0) - regexp_parser (2.9.0) - reline (0.4.2) + regexp_parser (2.8.2) + reline (0.3.9) io-console (~> 0.5) rexml (3.2.6) rubocop (1.48.1) @@ -326,11 +311,10 @@ GEM rubocop-performance (1.16.0) rubocop (>= 1.7.0, < 2.0) rubocop-ast (>= 0.4.0) - rubocop-rails (2.23.1) + rubocop-rails (2.20.2) activesupport (>= 4.2.0) rack (>= 1.1) rubocop (>= 1.33.0, < 2.0) - rubocop-ast (>= 1.30.0, < 2.0) ruby-progressbar (1.13.0) ruby-vips (2.2.0) ffi (~> 1.12) @@ -349,30 +333,24 @@ GEM railties (>= 7) solid_queue (0.2.1) rails (~> 7.1) - sqlite3 (1.7.2-aarch64-linux) - sqlite3 (1.7.2-arm-linux) - sqlite3 (1.7.2-arm64-darwin) - sqlite3 (1.7.2-x86-linux) - sqlite3 (1.7.2-x86_64-darwin) - sqlite3 (1.7.2-x86_64-linux) - sshkit (1.22.0) - mutex_m + sqlite3 (1.7.0) + mini_portile2 (~> 2.8.0) + sshkit (1.21.5) net-scp (>= 1.1.2) - net-sftp (>= 2.1.2) net-ssh (>= 2.8.0) standard (1.25.5) language_server-protocol (~> 3.17.0.2) rubocop (~> 1.48.1) rubocop-performance (~> 1.16.0) - standard-rails (1.0.2) + standard-rails (0.2.0) lint_roller (~> 1.0) - rubocop-rails (~> 2.23.1) + rubocop-rails (~> 2.20.2) stimulus-rails (1.2.2) railties (>= 6.0.0) - stringio (3.1.0) + stringio (3.0.8) thor (1.3.0) tilt (2.3.0) - timeout (0.4.1) + timeout (0.4.0) turbo-rails (1.5.0) actionpack (>= 6.0.0) activejob (>= 6.0.0) @@ -381,6 +359,8 @@ GEM concurrent-ruby (~> 1.0) unicode-display_width (2.5.0) uniform_notifier (1.16.0) + url_mount (0.2.1) + rack wahwah (1.5.1) web-console (4.2.1) actionview (>= 6.0.0) @@ -397,15 +377,10 @@ GEM websocket-extensions (0.1.5) xpath (3.2.0) nokogiri (~> 1.8) - zeitwerk (2.6.13) + zeitwerk (2.6.12) PLATFORMS - aarch64-linux - arm-linux - arm64-darwin - x86-linux - x86_64-darwin - x86_64-linux + ruby DEPENDENCIES acts_as_list (~> 1.1.0) @@ -448,4 +423,4 @@ DEPENDENCIES webmock (~> 3.18.0) BUNDLED WITH - 2.5.3 + 2.4.10 diff --git a/README.md b/README.md index 5e6d279b..6e7c6869 100644 --- a/README.md +++ b/README.md @@ -137,7 +137,7 @@ $ docker pull ghcr.io/blackcandy-org/blackcandy:edge ### Requirements -- Ruby 3.3 +- Ruby 3.2 - Node.js 18 - Yarn - libvips