diff --git a/.gitattributes b/.gitattributes deleted file mode 100644 index 0ede410e..00000000 --- a/.gitattributes +++ /dev/null @@ -1,2 +0,0 @@ -public/assets/** filter=lfs diff=lfs merge=lfs -text -public/packs/** filter=lfs diff=lfs merge=lfs -text diff --git a/.woodpecker.yml b/.woodpecker.yml index cdd99651..b5806bf3 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -20,6 +20,7 @@ pipeline: branch: - "rails" - "panel.sutty.nl" + - "17.3.alpine.panel.sutty.nl" event: "push" path: include: @@ -27,7 +28,7 @@ pipeline: - ".dockerignore" - ".woodpecker.yml" assets: - image: "gitea.nulo.in/sutty/panel:${ALPINE_VERSION}-${RUBY_VERSION}.${RUBY_PATCH}" + image: "gitea.nulo.in/sutty/panel:3.14.10-2.7.8" commands: - "apk add python2 dotenv openssh-client brotli" - "install -d -m 700 ~/.ssh/" @@ -51,6 +52,9 @@ pipeline: - "git add public && git commit -m \"ci: assets [skip ci]\"" - "git pull upstream ${CI_COMMIT_BRANCH}" - "git push upstream ${CI_COMMIT_BRANCH}" + environment: + - "RUBY_VERSION=${RUBY_VERSION}" + - "GEMS_SOURCE=https://14.3.alpine.gems.sutty.nl" secrets: - "SSH_KEY" - "KNOWN_HOSTS" @@ -65,8 +69,15 @@ pipeline: - "app/javascript/**/*" - "package.json" - "yarn.lock" + matrix: + ALPINE_VERSION: "3.14.10" + RUBY_VERSION: "2.7" + RUBY_PATCH: "8" matrix: include: + - ALPINE_VERSION: "3.17.3" + RUBY_VERSION: "3.1" + RUBY_PATCH: "4" - ALPINE_VERSION: "3.14.10" RUBY_VERSION: "2.7" RUBY_PATCH: "8" diff --git a/Gemfile b/Gemfile index 9be8a763..dd880219 100644 --- a/Gemfile +++ b/Gemfile @@ -1,9 +1,8 @@ # frozen_string_literal: true -puts 'Usa haini.sh para generar un entorno de trabajo reproducible' -source 'https://gems.sutty.nl' +source ENV.fetch('GEMS_SOURCE', 'https://17.3.alpine.gems.sutty.nl') -ruby '~> 2.7' +ruby "~> #{ENV.fetch('RUBY_VERSION', '3.1')}" gem 'dotenv-rails', require: 'dotenv/rails-now' @@ -55,7 +54,7 @@ gem 'httparty' gem 'safe_yaml', require: false gem 'jekyll', '~> 4.2.0' gem 'jekyll-data' -gem 'jekyll-commonmark' +gem 'jekyll-commonmark', '~> 1.4.0' gem 'jekyll-images' gem 'jekyll-include-cache' gem 'sutty-liquid', '>= 0.7.3' @@ -120,11 +119,11 @@ group :development do gem 'brakeman' gem 'haml-lint', require: false gem 'letter_opener' - gem 'listen', '>= 3.0.5', '< 3.2' + gem 'listen' gem 'rubocop-rails' gem 'spring' - gem 'spring-watcher-listen', '~> 2.0.0' - gem 'web-console', '>= 3.3.0' + gem 'spring-watcher-listen' + gem 'web-console' end group :test do diff --git a/Gemfile.lock b/Gemfile.lock index 96889531..f71053d7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -25,7 +25,7 @@ GIT groupdate (>= 5.2) GEM - remote: https://gems.sutty.nl/ + remote: https://17.3.alpine.gems.sutty.nl/ specs: actioncable (6.1.7.3) actionpack (= 6.1.7.3) @@ -91,11 +91,9 @@ GEM ast (2.4.2) autoprefixer-rails (10.4.13.0) execjs (~> 2) - bcrypt (3.1.18-x86_64-linux-musl) - bcrypt_pbkdf (1.1.0) + bcrypt (3.1.19-x86_64-linux-musl) bcrypt_pbkdf (1.1.0-x86_64-linux-musl) benchmark-ips (2.12.0) - bindex (0.8.1) bindex (0.8.1-x86_64-linux-musl) blazer (2.6.5) activerecord (>= 5) @@ -119,8 +117,7 @@ GEM climate_control (1.2.0) coderay (1.1.3) colorator (1.1.0) - commonmarker (0.23.9) - commonmarker (0.23.9-x86_64-linux-musl) + commonmarker (0.23.10-x86_64-linux-musl) concurrent-ruby (1.2.2) concurrent-ruby-ext (1.2.2-x86_64-linux-musl) concurrent-ruby (= 1.2.2) @@ -131,7 +128,6 @@ GEM activerecord (>= 5.a) database_cleaner-core (~> 2.0.0) database_cleaner-core (2.0.1) - date (3.3.3) date (3.3.3-x86_64-linux-musl) dead_end (4.0.0) derailed_benchmarks (2.1.2) @@ -154,7 +150,7 @@ GEM warden (~> 1.2.3) devise-i18n (1.11.0) devise (>= 4.9.0) - devise_invitable (2.0.7) + devise_invitable (2.0.8) actionmailer (>= 5.0) devise (>= 4.6) distributed-press-api-client (0.2.4) @@ -196,14 +192,12 @@ GEM dry-inflector (~> 1.0) dry-logic (~> 1.4) zeitwerk (~> 2.6) - ed25519 (1.3.0) ed25519 (1.3.0-x86_64-linux-musl) em-websocket (0.5.3) eventmachine (>= 0.12.9) http_parser.rb (~> 0) errbase (0.2.2) erubi (1.12.0) - eventmachine (1.2.7) eventmachine (1.2.7-x86_64-linux-musl) exception_notification (4.5.0) actionmailer (>= 5.2, < 8) @@ -214,11 +208,8 @@ GEM factory_bot_rails (6.2.0) factory_bot (~> 6.2.0) railties (>= 5.0.0) - fast_blank (1.0.1) fast_blank (1.0.1-x86_64-linux-musl) - fast_jsonparser (0.5.0) fast_jsonparser (0.5.0-x86_64-linux-musl) - ffi (1.15.5) ffi (1.15.5-x86_64-linux-musl) flamegraph (0.9.5) forwardable-extended (2.6.0) @@ -234,7 +225,7 @@ GEM activerecord (>= 6.0, < 8) ruby2ruby (~> 2.4) ruby_parser (~> 3.10) - haml (6.1.1-x86_64-linux-musl) + haml (6.1.2-x86_64-linux-musl) temple (>= 0.8.2) thor tilt @@ -246,10 +237,6 @@ GEM rainbow rubocop (>= 0.50.0) sysexits (~> 1.1) - hamlit (3.0.3) - temple (>= 0.8.2) - thor - tilt hamlit (3.0.3-x86_64-linux-musl) temple (>= 0.8.2) thor @@ -261,14 +248,12 @@ GEM railties (>= 4.0.1) heapy (0.2.0) thor - hiredis (0.6.3) hiredis (0.6.3-x86_64-linux-musl) - http_parser.rb (0.8.0) http_parser.rb (0.8.0-x86_64-linux-musl) httparty (0.21.0) mini_mime (>= 1.0.0) multi_xml (>= 0.5.2) - i18n (1.13.0) + i18n (1.14.1) concurrent-ruby (~> 1.0) icalendar (2.8.0) ice_cube (~> 0.16) @@ -334,10 +319,9 @@ GEM letter_opener (1.8.1) launchy (>= 2.2, < 3) liquid (4.0.4) - listen (3.1.5) - rb-fsevent (~> 0.9, >= 0.9.4) - rb-inotify (~> 0.9, >= 0.9.7) - ruby_dep (~> 1.2) + listen (3.8.0) + rb-fsevent (~> 0.10, >= 0.10.3) + rb-inotify (~> 0.9, >= 0.9.10) loaf (0.10.0) railties (>= 3.2) lockbox (1.2.0) @@ -361,6 +345,7 @@ GEM mini_histogram (0.3.1) mini_magick (4.12.0) mini_mime (1.1.2) + mini_portile2 (2.8.2) minitest (5.18.0) mobility (1.2.9) i18n (>= 0.6.10, < 2) @@ -381,7 +366,8 @@ GEM njalla-api-client (0.2.0) dry-schema httparty (~> 0.18) - nokogiri (1.15.1-x86_64-linux) + nokogiri (1.15.4-x86_64-linux-musl) + mini_portile2 (~> 2.8.2) racc (~> 1.4) orm_adapter (0.5.0) pairing_heap (3.0.1) @@ -400,14 +386,13 @@ GEM pry (0.14.2) coderay (~> 1.1) method_source (~> 1.0) - public_suffix (5.0.1) - puma (6.2.2-x86_64-linux-musl) + public_suffix (5.0.3) + puma (6.3.1-x86_64-linux-musl) nio4r (~> 2.0) pundit (2.3.0) activesupport (>= 3.0.0) que (2.2.1) - racc (1.6.2) - racc (1.6.2-x86_64-linux-musl) + racc (1.7.1-x86_64-linux-musl) rack (2.2.7) rack-cors (2.0.1) rack (>= 2.0.0) @@ -498,7 +483,6 @@ GEM activesupport (>= 4.2.0) rack (>= 1.1) rubocop (>= 1.33.0, < 2.0) - ruby-filemagic (0.7.3) ruby-filemagic (0.7.3-x86_64-linux-musl) ruby-progressbar (1.13.0) ruby-statistics (3.0.2) @@ -507,17 +491,13 @@ GEM ruby2ruby (2.5.0) ruby_parser (~> 3.1) sexp_processor (~> 4.6) - ruby_dep (1.5.0) ruby_parser (3.20.1) sexp_processor (~> 4.16) rubyzip (2.3.2) - rugged (1.6.3) rugged (1.6.3-x86_64-linux-musl) safe_yaml (1.0.6) safely_block (0.3.0) errbase (>= 0.1.1) - sassc (2.4.0) - ffi (~> 1.9) sassc (2.4.0-x86_64-linux-musl) ffi (~> 1.9) sassc-rails (2.1.2) @@ -535,10 +515,10 @@ GEM simpleidn (0.2.1) unf (~> 0.1.4) sourcemap (0.1.1) - spring (2.1.1) - spring-watcher-listen (2.0.1) + spring (4.1.1) + spring-watcher-listen (2.1.0) listen (>= 2.7, < 4.0) - spring (>= 1.2, < 3.0) + spring (>= 4) sprockets (4.2.0) concurrent-ruby (~> 1.0) rack (>= 2.2.4, < 4) @@ -546,10 +526,11 @@ GEM actionpack (>= 5.2) activesupport (>= 5.2) sprockets (>= 3.0.0) - sqlite3 (1.6.3-x86_64-linux) + sqlite3 (1.6.3-x86_64-linux-musl) + mini_portile2 (~> 2.8.0) stackprof (0.2.25-x86_64-linux-musl) stream (0.5.5) - sutty-liquid (0.11.10) + sutty-liquid (0.11.11) fast_blank (~> 1.0) jekyll (~> 4) symbol-fstring (1.0.2-x86_64-linux-musl) @@ -589,7 +570,7 @@ GEM semantic_range (>= 2.3.0) webrick (1.8.1) websocket (1.2.9) - websocket-driver (0.7.5-x86_64-linux-musl) + websocket-driver (0.7.6-x86_64-linux-musl) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) xpath (3.2.0) @@ -597,7 +578,6 @@ GEM zeitwerk (2.6.8) PLATFORMS - ruby x86_64-linux-musl DEPENDENCIES @@ -636,13 +616,13 @@ DEPENDENCIES inline_svg jbuilder (~> 2.5) jekyll (~> 4.2.0) - jekyll-commonmark + jekyll-commonmark (~> 1.4.0) jekyll-data jekyll-images jekyll-include-cache kaminari letter_opener - listen (>= 3.0.5, < 3.2) + listen loaf lockbox lograge @@ -677,7 +657,7 @@ DEPENDENCIES selenium-webdriver (~> 4.8.0) sourcemap spring - spring-watcher-listen (~> 2.0.0) + spring-watcher-listen sqlite3 stackprof sutty-liquid (>= 0.7.3) @@ -687,12 +667,12 @@ DEPENDENCIES turbolinks (~> 5) uglifier (>= 1.3.0) validates_hostname - web-console (>= 3.3.0) + web-console webpacker yaml_db! RUBY VERSION - ruby 2.7.1p83 + ruby 3.1.4p223 BUNDLED WITH - 2.2.20 + 2.4.17 diff --git a/app/lib/active_job/serializers/exception_serializer.rb b/app/lib/active_job/serializers/exception_serializer.rb deleted file mode 100644 index 42b55835..00000000 --- a/app/lib/active_job/serializers/exception_serializer.rb +++ /dev/null @@ -1,22 +0,0 @@ -# frozen_string_literal: true - -require 'json/add/exception' - -module ActiveJob - module Serializers - class ExceptionSerializer < ObjectSerializer # :nodoc: - def serialize(ex) - super('value' => { 'class' => ex.class.name, 'exception' => ex.as_json }) - end - - def deserialize(hash) - hash.dig('value', 'class').constantize.json_create(hash.dig('value', 'exception')) - end - - private - def klass - Exception - end - end - end -end diff --git a/db/migrate/20230328231029_create_que_tables.rb b/db/migrate/20230328231029_create_que_tables.rb deleted file mode 100644 index 1ed929f7..00000000 --- a/db/migrate/20230328231029_create_que_tables.rb +++ /dev/null @@ -1,12 +0,0 @@ -# frozen_string_literal: true - -# Que -class CreateQueTables < ActiveRecord::Migration[6.1] - def up - Que.migrate! version: 7 - end - - def down - Que.migrate! version: 0 - end -end