From 14d4ce8c7ccd3125ce392b77c1c9818e060a30ce Mon Sep 17 00:00:00 2001 From: "G. Torres" <gelsey@ombulabs.com> Date: Tue, 3 Sep 2024 11:45:08 -0400 Subject: [PATCH 01/12] BIB-45: Adds next Rails code, Gemfile.next, and Gemfile.next.lock in order to dual boot both rails --- Gemfile | 11 +- Gemfile.next | 1 + Gemfile.next.lock | 909 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 920 insertions(+), 1 deletion(-) create mode 120000 Gemfile.next create mode 100644 Gemfile.next.lock diff --git a/Gemfile b/Gemfile index a2b5dfdc2c..0a4cb13f69 100644 --- a/Gemfile +++ b/Gemfile @@ -1,5 +1,9 @@ # frozen_string_literal: true +def next? + File.basename(__FILE__) == "Gemfile.next" +end + source "https://rubygems.org" git_source(:github) { |repo| "https://github.com/#{repo}.git" } @@ -8,7 +12,12 @@ git_source(:gitlab) { |repo| "https://gitlab.com/#{repo}.git" } # Update CircleCI config if Ruby version is bumped ruby "2.7.8" gem "rack", "~> 2.2.3" -gem "rails", "~> 6.0" + +if next? + gem "rails", "~> 7.0.8.4" +else + gem "rails", "~> 6.0" +end gem "puma" # App server gem "bcrypt", "~> 3.1.7" # encryption diff --git a/Gemfile.next b/Gemfile.next new file mode 120000 index 0000000000..6ab79009c0 --- /dev/null +++ b/Gemfile.next @@ -0,0 +1 @@ +Gemfile \ No newline at end of file diff --git a/Gemfile.next.lock b/Gemfile.next.lock new file mode 100644 index 0000000000..91e5e5423d --- /dev/null +++ b/Gemfile.next.lock @@ -0,0 +1,909 @@ +GIT + remote: https://github.com/bikeindex/swagger-ui_rails.git + revision: 0377d8ecd0714901351a6bfc68491d255ad86093 + branch: bike_index_0.1.7 + specs: + swagger-ui_rails (0.1.7) + +GIT + remote: https://github.com/facebook/facebook-ruby-business-sdk.git + revision: c64b51f862c2359d289a9aea6d317cf1218595aa + branch: main + specs: + facebookbusiness (0.15.0.2) + concurrent-ruby (~> 1.1) + countries (~> 3.0) + faraday (~> 1.0) + json (~> 2.2) + money (~> 6.13) + +GIT + remote: https://github.com/mailchimp/mailchimp-marketing-ruby.git + revision: 2cd67937bff16b42d38e0b0a918b4f2014c1a98c + specs: + MailchimpMarketing (3.0.48) + excon (~> 0.76.0) + json (~> 2.1, >= 2.1.0) + +GEM + remote: https://rails-assets.org/ + specs: + rails-assets-Stickyfill (1.1.4) + rails-assets-jquery (3.4.1) + rails-assets-jquery.dirtyforms (2.0.0) + rails-assets-jquery (>= 1.4.2) + rails-assets-lodash (4.9.0) + rails-assets-mailcheck (1.1.2) + rails-assets-microplugin (0.0.3) + rails-assets-moment (2.18.1) + rails-assets-moment-timezone (0.5.25) + rails-assets-moment (>= 2.9.0) + rails-assets-mustache (2.2.1) + rails-assets-select2 (4.0.8) + rails-assets-selectize (0.12.6) + rails-assets-jquery (>= 1.7.0) + rails-assets-microplugin (~> 0.0.0) + rails-assets-sifter (~> 0.5.0) + rails-assets-sifter (0.5.3) + rails-assets-tether (1.1.1) + rails-assets-waypoints (3.1.1) + +GEM + remote: https://rubygems.org/ + specs: + actioncable (7.0.8.4) + actionpack (= 7.0.8.4) + activesupport (= 7.0.8.4) + nio4r (~> 2.0) + websocket-driver (>= 0.6.1) + actionmailbox (7.0.8.4) + actionpack (= 7.0.8.4) + activejob (= 7.0.8.4) + activerecord (= 7.0.8.4) + activestorage (= 7.0.8.4) + activesupport (= 7.0.8.4) + mail (>= 2.7.1) + net-imap + net-pop + net-smtp + actionmailer (7.0.8.4) + actionpack (= 7.0.8.4) + actionview (= 7.0.8.4) + activejob (= 7.0.8.4) + activesupport (= 7.0.8.4) + mail (~> 2.5, >= 2.5.4) + net-imap + net-pop + net-smtp + rails-dom-testing (~> 2.0) + actionpack (7.0.8.4) + actionview (= 7.0.8.4) + activesupport (= 7.0.8.4) + rack (~> 2.0, >= 2.2.4) + rack-test (>= 0.6.3) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.2.0) + actiontext (7.0.8.4) + actionpack (= 7.0.8.4) + activerecord (= 7.0.8.4) + activestorage (= 7.0.8.4) + activesupport (= 7.0.8.4) + globalid (>= 0.6.0) + nokogiri (>= 1.8.5) + actionview (7.0.8.4) + activesupport (= 7.0.8.4) + builder (~> 3.1) + erubi (~> 1.4) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.1, >= 1.2.0) + active_model_serializers (0.8.4) + activemodel (>= 3.0) + activejob (7.0.8.4) + activesupport (= 7.0.8.4) + globalid (>= 0.3.6) + activemodel (7.0.8.4) + activesupport (= 7.0.8.4) + activerecord (7.0.8.4) + activemodel (= 7.0.8.4) + activesupport (= 7.0.8.4) + activestorage (7.0.8.4) + actionpack (= 7.0.8.4) + activejob (= 7.0.8.4) + activerecord (= 7.0.8.4) + activesupport (= 7.0.8.4) + marcel (~> 1.0) + mini_mime (>= 1.1.0) + activesupport (7.0.8.4) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 1.6, < 2) + minitest (>= 5.1) + tzinfo (~> 2.0) + addressable (2.8.7) + public_suffix (>= 2.0.2, < 7.0) + annotate (3.2.0) + activerecord (>= 3.2, < 8.0) + rake (>= 10.4, < 14.0) + api-pagination (5.0.0) + ast (2.4.2) + autoprefixer-rails (9.7.3) + execjs + axlsx (3.0.0.pre) + htmlentities (~> 4.3, >= 4.3.4) + mimemagic (~> 0.3) + nokogiri (~> 1.8, >= 1.8.2) + rubyzip (~> 1.2, >= 1.2.1) + bcrypt (3.1.13) + better_html (2.0.2) + actionview (>= 6.0) + activesupport (>= 6.0) + ast (~> 2.0) + erubi (~> 1.4) + parser (>= 2.4) + smart_properties + bigdecimal (3.1.5) + bootsnap (1.16.0) + msgpack (~> 1.2) + bootstrap (4.0.0.alpha4) + autoprefixer-rails (>= 6.0.3) + sass (>= 3.4.19) + brakeman (5.4.1) + buftok (0.2.0) + builder (3.3.0) + bullet (7.0.1) + activesupport (>= 3.0.0) + uniform_notifier (~> 1.11) + byebug (11.1.3) + carrierwave (2.2.6) + activemodel (>= 5.0.0) + activesupport (>= 5.0.0) + addressable (~> 2.6) + image_processing (~> 1.1) + marcel (~> 1.0.0) + mini_mime (>= 0.1.3) + ssrf_filter (~> 1.0) + carrierwave_backgrounder (1.0.2) + carrierwave (> 2.0, < 4.0) + rails (> 6.0, < 8.0) + chartkick (4.1.3) + chunky_png (1.4.0) + coderay (1.1.3) + coffee-rails (4.2.2) + coffee-script (>= 2.2.0) + railties (>= 4.0.0) + coffee-script (2.4.1) + coffee-script-source + execjs + coffee-script-source (1.12.2) + concurrent-ruby (1.3.4) + connection_pool (2.4.1) + countries (3.1.0) + i18n_data (~> 0.11.0) + sixarm_ruby_unaccent (~> 1.1) + unicode_utils (~> 1.4) + crack (0.4.3) + safe_yaml (~> 1.0.0) + crass (1.0.6) + css_parser (1.7.1) + addressable + database_cleaner (1.7.0) + date (3.3.4) + diff-lcs (1.4.4) + docile (1.4.0) + domain_name (0.5.20190701) + unf (>= 0.0.5, < 1.0.0) + doorkeeper (5.2.6) + railties (>= 5) + doorkeeper-i18n (5.2.2) + doorkeeper (>= 5.2) + dotenv (2.7.6) + dotenv-rails (2.7.6) + dotenv (= 2.7.6) + railties (>= 3.2) + dry-core (1.0.0) + concurrent-ruby (~> 1.0) + zeitwerk (~> 2.6) + dry-inflector (1.0.0) + dry-logic (1.5.0) + concurrent-ruby (~> 1.0) + dry-core (~> 1.0, < 2) + zeitwerk (~> 2.6) + dry-types (1.7.1) + concurrent-ruby (~> 1.0) + dry-core (~> 1.0) + dry-inflector (~> 1.0) + dry-logic (~> 1.4) + zeitwerk (~> 2.6) + equalizer (0.0.11) + erubi (1.13.0) + eventmachine (1.2.7) + excon (0.76.0) + execjs (2.7.0) + factory_bot (6.2.1) + activesupport (>= 5.0.0) + factory_bot_rails (6.2.0) + factory_bot (~> 6.2.0) + railties (>= 5.0.0) + faraday (1.10.3) + faraday-em_http (~> 1.0) + faraday-em_synchrony (~> 1.0) + faraday-excon (~> 1.1) + faraday-httpclient (~> 1.0) + faraday-multipart (~> 1.0) + faraday-net_http (~> 1.0) + faraday-net_http_persistent (~> 1.0) + faraday-patron (~> 1.0) + faraday-rack (~> 1.0) + faraday-retry (~> 1.0) + ruby2_keywords (>= 0.0.4) + faraday-em_http (1.0.0) + faraday-em_synchrony (1.0.0) + faraday-excon (1.1.0) + faraday-httpclient (1.0.1) + faraday-multipart (1.0.4) + multipart-post (~> 2) + faraday-net_http (1.0.1) + faraday-net_http_persistent (1.2.0) + faraday-patron (1.0.0) + faraday-rack (1.0.0) + faraday-retry (1.0.3) + faraday_middleware (1.0.0) + faraday (~> 1.0) + fast_blank (1.0.0) + ffi (1.17.0) + ffi-compiler (1.0.1) + ffi (>= 1.0.0) + rake + flamegraph (0.9.5) + flipper (1.3.0) + concurrent-ruby (< 2) + flipper-active_record (1.3.0) + activerecord (>= 4.2, < 8) + flipper (~> 1.3.0) + flipper-ui (1.3.0) + erubi (>= 1.0.0, < 2.0.0) + flipper (~> 1.3.0) + rack (>= 1.4, < 4) + rack-protection (>= 1.5.3, < 5.0.0) + rack-session (>= 1.0.2, < 3.0.0) + sanitize (< 7) + fog-aws (3.24.0) + fog-core (~> 2.1) + fog-json (~> 1.1) + fog-xml (~> 0.1) + fog-core (2.5.0) + builder + excon (~> 0.71) + formatador (>= 0.2, < 2.0) + mime-types + fog-json (1.2.0) + fog-core + multi_json (~> 1.10) + fog-xml (0.1.4) + fog-core + nokogiri (>= 1.5.11, < 2.0.0) + foreman (0.86.0) + formatador (1.1.0) + geocoder (1.6.1) + gettext (3.3.7) + locale (>= 2.0.5) + text (>= 1.3.0) + globalid (1.2.1) + activesupport (>= 6.1) + grape (1.8.0) + activesupport (>= 5) + builder + dry-types (>= 1.1) + mustermann-grape (~> 1.0.0) + rack (>= 1.3.0) + rack-accept + grape-entity (0.4.8) + activesupport + multi_json (>= 1.3.2) + grape-swagger (0.11.0) + grape (>= 0.16.2) + grape-entity (< 0.5.0) + grape_logging (1.8.4) + grape + rack + groupdate (6.0.1) + activesupport (>= 5.2) + guard (2.16.2) + formatador (>= 0.2.4) + listen (>= 2.7, < 4.0) + lumberjack (>= 1.0.12, < 2.0) + nenv (~> 0.1) + notiffany (~> 0.0) + pry (>= 0.9.12) + shellany (~> 0.0) + thor (>= 0.18.1) + guard-compat (1.2.1) + guard-rspec (4.7.3) + guard (~> 2.1) + guard-compat (~> 1.1) + rspec (>= 2.99.0, < 4.0) + hamlit (2.16.0) + temple (>= 0.8.2) + thor + tilt + hashdiff (1.0.0) + hashie (5.0.0) + highline (2.1.0) + honeybadger (4.5.4) + htmlentities (4.3.4) + http (4.4.1) + addressable (~> 2.3) + http-cookie (~> 1.0) + http-form_data (~> 2.2) + http-parser (~> 1.2.0) + http-cookie (1.0.3) + domain_name (~> 0.5) + http-form_data (2.3.0) + http-parser (1.2.3) + ffi-compiler (>= 1.0, < 2.0) + http_parser.rb (0.6.0) + httparty (0.16.2) + multi_xml (>= 0.5.2) + i18n (1.14.5) + concurrent-ruby (~> 1.0) + i18n-country-translations (1.4.1) + i18n (>= 0.9.3, < 2) + railties (>= 5.0) + i18n-js (3.5.0) + i18n (>= 0.6.6) + i18n-tasks (1.0.13) + activesupport (>= 4.0.2) + ast (>= 2.1.0) + better_html (>= 1.0, < 3.0) + erubi + highline (>= 2.0.0) + i18n + parser (>= 3.2.2.1) + rails-i18n + rainbow (>= 2.2.2, < 4.0) + terminal-table (>= 1.5.1) + i18n_data (0.11.0) + i18n_generators (2.2.2) + activerecord (>= 3.0.0) + railties (>= 3.0.0) + image_processing (1.13.0) + mini_magick (>= 4.9.5, < 5) + ruby-vips (>= 2.0.17, < 3) + jquery-rails (4.3.5) + rails-dom-testing (>= 1, < 3) + railties (>= 4.2.0) + thor (>= 0.14, < 2.0) + json (2.7.0) + jwt (2.2.2) + kaminari (1.2.2) + activesupport (>= 4.1.0) + kaminari-actionview (= 1.2.2) + kaminari-activerecord (= 1.2.2) + kaminari-core (= 1.2.2) + kaminari-actionview (1.2.2) + actionview + kaminari-core (= 1.2.2) + kaminari-activerecord (1.2.2) + activerecord + kaminari-core (= 1.2.2) + kaminari-core (1.2.2) + kramdown (2.3.1) + rexml + kramdown-parser-gfm (1.1.0) + kramdown (~> 2.0) + launchy (2.5.2) + addressable (~> 2.8) + letter_opener (1.8.1) + launchy (>= 2.2, < 3) + listen (3.8.0) + rb-fsevent (~> 0.10, >= 0.10.3) + rb-inotify (~> 0.9, >= 0.9.10) + locale (2.1.3) + logger (1.6.0) + lograge (0.14.0) + actionpack (>= 4) + activesupport (>= 4) + railties (>= 4) + request_store (~> 1.0) + logstash-event (1.2.02) + loofah (2.22.0) + crass (~> 1.0.2) + nokogiri (>= 1.12.0) + lumberjack (1.2.8) + mail (2.8.1) + mini_mime (>= 0.1.1) + net-imap + net-pop + net-smtp + marcel (1.0.4) + memoizable (0.4.2) + thread_safe (~> 0.3, >= 0.3.1) + memory_profiler (0.9.14) + method_source (1.1.0) + mime-types (3.5.2) + mime-types-data (~> 3.2015) + mime-types-data (3.2024.0820) + mimemagic (0.4.3) + nokogiri (~> 1) + rake + mini_magick (4.13.2) + mini_mime (1.1.5) + mini_portile2 (2.8.7) + minitest (5.25.1) + monetize (1.12.0) + money (~> 6.12) + money (6.16.0) + i18n (>= 0.6.4, <= 2) + money-rails (1.15.0) + activesupport (>= 3.0) + monetize (~> 1.9) + money (~> 6.13) + railties (>= 3.0) + msgpack (1.7.2) + multi_json (1.15.0) + multi_xml (0.6.0) + multipart-post (2.3.0) + mustermann (3.0.0) + ruby2_keywords (~> 0.0.1) + mustermann-grape (1.0.2) + mustermann (>= 1.0.0) + naught (1.1.0) + nenv (0.3.0) + net-http (0.3.2) + uri + net-imap (0.4.14) + date + net-protocol + net-pop (0.1.2) + net-protocol + net-protocol (0.2.2) + timeout + net-smtp (0.5.0) + net-protocol + nio4r (2.7.3) + nokogiri (1.15.6) + mini_portile2 (~> 2.8.2) + racc (~> 1.4) + nokogiri (1.15.6-x86_64-linux) + racc (~> 1.4) + notiffany (0.1.3) + nenv (~> 0.1) + shellany (~> 0.0) + oauth (1.1.0) + oauth-tty (~> 1.0, >= 1.0.1) + snaky_hash (~> 2.0) + version_gem (~> 1.1) + oauth-tty (1.0.5) + version_gem (~> 1.1, >= 1.1.1) + oauth2 (1.4.4) + faraday (>= 0.8, < 2.0) + jwt (>= 1.0, < 3.0) + multi_json (~> 1.3) + multi_xml (~> 0.5) + rack (>= 1.2, < 3) + oj (3.16.3) + bigdecimal (>= 3.0) + omniauth (2.0.4) + hashie (>= 3.4.6) + rack (>= 1.6.2, < 3) + rack-protection + omniauth-facebook (5.0.0) + omniauth-oauth2 (~> 1.2) + omniauth-globalid (0.0.2) + omniauth-oauth (~> 1.1) + rack + omniauth-oauth (1.2.0) + oauth + omniauth (>= 1.0, < 3) + omniauth-oauth2 (1.8.0) + oauth2 (>= 1.4, < 3) + omniauth (~> 2.0) + omniauth-strava (1.0.0) + omniauth (~> 2.0) + omniauth-oauth2 (~> 1.0) + omniauth-twitter (1.4.0) + omniauth-oauth (~> 1.1) + rack + parallel (1.22.1) + parallel_tests (2.30.0) + parallel + paranoia (2.5.2) + activerecord (>= 5.1, < 7.1) + parser (3.2.2.4) + ast (~> 2.4.1) + racc + pg (1.5.6) + pg_search (2.3.6) + activerecord (>= 5.2) + activesupport (>= 5.2) + postmark (1.22.0) + json + postmark-rails (0.21.0) + actionmailer (>= 3.0.0) + postmark (>= 1.21.3, < 2.0) + premailer (1.11.1) + addressable + css_parser (>= 1.6.0) + htmlentities (>= 4.0.0) + premailer-rails (1.10.3) + actionmailer (>= 3) + premailer (~> 1.7, >= 1.7.9) + pry (0.14.2) + coderay (~> 1.1) + method_source (~> 1.0) + pry-byebug (3.10.1) + byebug (~> 11.0) + pry (>= 0.13, < 0.15) + pry-rails (0.3.9) + pry (>= 0.10.4) + public_suffix (5.1.1) + puma (6.3.1) + nio4r (~> 2.0) + racc (1.8.1) + rack (2.2.9) + rack-accept (0.4.5) + rack (>= 0.4) + rack-mini-profiler (2.3.1) + rack (>= 1.2.0) + rack-protection (2.0.8.1) + rack + rack-proxy (0.7.7) + rack + rack-session (1.0.2) + rack (< 3) + rack-test (2.1.0) + rack (>= 1.3) + rack-throttle (0.7.0) + bundler (>= 1.0.0) + rack (>= 1.0.0) + rails (7.0.8.4) + actioncable (= 7.0.8.4) + actionmailbox (= 7.0.8.4) + actionmailer (= 7.0.8.4) + actionpack (= 7.0.8.4) + actiontext (= 7.0.8.4) + actionview (= 7.0.8.4) + activejob (= 7.0.8.4) + activemodel (= 7.0.8.4) + activerecord (= 7.0.8.4) + activestorage (= 7.0.8.4) + activesupport (= 7.0.8.4) + bundler (>= 1.15.0) + railties (= 7.0.8.4) + rails-controller-testing (1.0.4) + actionpack (>= 5.0.1.x) + actionview (>= 5.0.1.x) + activesupport (>= 5.0.1.x) + rails-dom-testing (2.2.0) + activesupport (>= 5.0.0) + minitest + nokogiri (>= 1.6) + rails-html-sanitizer (1.6.0) + loofah (~> 2.21) + nokogiri (~> 1.14) + rails-i18n (7.0.8) + i18n (>= 0.7, < 2) + railties (>= 6.0.0, < 8) + railties (7.0.8.4) + actionpack (= 7.0.8.4) + activesupport (= 7.0.8.4) + method_source + rake (>= 12.2) + thor (~> 1.0) + zeitwerk (~> 2.5) + rainbow (3.1.1) + rake (13.2.1) + rb-fsevent (0.10.4) + rb-inotify (0.10.1) + ffi (~> 1.0) + redis (5.0.8) + redis-client (>= 0.17.0) + redis-client (0.17.1) + connection_pool + redlock (2.0.6) + redis-client (>= 0.14.1, < 1.0.0) + regexp_parser (2.5.0) + request_store (1.5.1) + rack (>= 1.4) + rerun (0.14.0) + listen (~> 3.0) + responders (3.0.1) + actionpack (>= 5.0) + railties (>= 5.0) + rexml (3.2.5) + rqrcode (0.10.1) + chunky_png (~> 1.0) + rspec (3.9.0) + rspec-core (~> 3.9.0) + rspec-expectations (~> 3.9.0) + rspec-mocks (~> 3.9.0) + rspec-core (3.9.3) + rspec-support (~> 3.9.3) + rspec-expectations (3.9.4) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.9.0) + rspec-mocks (3.9.1) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.9.0) + rspec-rails (4.0.1) + actionpack (>= 4.2) + activesupport (>= 4.2) + railties (>= 4.2) + rspec-core (~> 3.9) + rspec-expectations (~> 3.9) + rspec-mocks (~> 3.9) + rspec-support (~> 3.9) + rspec-retry (0.6.2) + rspec-core (> 3.3) + rspec-sidekiq (3.0.3) + rspec-core (~> 3.0, >= 3.0.0) + sidekiq (>= 2.4.0) + rspec-support (3.9.4) + rspec_junit_formatter (0.4.1) + rspec-core (>= 2, < 4, != 2.12.0) + rubocop (1.32.0) + json (~> 2.3) + parallel (~> 1.10) + parser (>= 3.1.0.0) + rainbow (>= 2.2.2, < 4.0) + regexp_parser (>= 1.8, < 3.0) + rexml (>= 3.2.5, < 4.0) + rubocop-ast (>= 1.19.1, < 2.0) + ruby-progressbar (~> 1.7) + unicode-display_width (>= 1.4.0, < 3.0) + rubocop-ast (1.21.0) + parser (>= 3.1.1.0) + rubocop-performance (1.14.3) + rubocop (>= 1.7.0, < 2.0) + rubocop-ast (>= 0.4.0) + ruby-progressbar (1.11.0) + ruby-vips (2.2.2) + ffi (~> 1.12) + logger + ruby2_keywords (0.0.5) + rubyzip (1.3.0) + safe_yaml (1.0.5) + sanitize (6.1.1) + crass (~> 1.0.2) + nokogiri (>= 1.12.0) + sass (3.7.4) + sass-listen (~> 4.0.0) + sass-listen (4.0.0) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) + sass-rails (6.0.0) + sassc-rails (~> 2.1, >= 2.1.1) + sassc (2.4.0) + ffi (~> 1.9) + sassc-rails (2.1.2) + railties (>= 4.0.0) + sassc (>= 2.0) + sprockets (> 3.0) + sprockets-rails + tilt + secure_headers (2.5.3) + user_agent_parser + semantic_range (3.0.0) + shellany (0.0.1) + sidekiq (6.5.5) + connection_pool (>= 2.2.2) + rack (~> 2.0) + redis (>= 4.5.0) + sidekiq-failures (1.0.0) + sidekiq (>= 4.0.0) + simple_oauth (0.3.1) + simplecov (0.22.0) + docile (~> 1.1) + simplecov-html (~> 0.11) + simplecov_json_formatter (~> 0.1) + simplecov-html (0.12.3) + simplecov_json_formatter (0.1.4) + sitemap_generator (6.1.2) + builder (~> 3.0) + sixarm_ruby_unaccent (1.2.0) + skylight (5.3.4) + activesupport (>= 5.2.0) + smart_properties (1.17.0) + snaky_hash (2.0.1) + hashie + version_gem (~> 1.1, >= 1.1.1) + sprockets (4.0.0) + concurrent-ruby (~> 1.0) + rack (> 1, < 3) + sprockets-rails (3.5.2) + actionpack (>= 6.1) + activesupport (>= 6.1) + sprockets (>= 3.0.0) + ssrf_filter (1.1.2) + stackprof (0.2.14) + standard (1.14.0) + rubocop (= 1.32.0) + rubocop-performance (= 1.14.3) + stripe (5.35.0) + temple (0.8.2) + terminal-notifier (2.0.0) + terminal-table (3.0.2) + unicode-display_width (>= 1.1.1, < 3) + text (1.3.1) + thor (1.3.1) + thread_safe (0.3.6) + tilt (2.3.0) + timeout (0.4.1) + translation (1.26) + gettext (~> 3.2, >= 3.2.5, <= 3.3.7) + twilio-ruby (5.40.4) + faraday (>= 0.9, < 2.0) + jwt (>= 1.5, <= 2.5) + nokogiri (>= 1.6, < 2.0) + twitter (7.0.0) + addressable (~> 2.3) + buftok (~> 0.2.0) + equalizer (~> 0.0.11) + http (~> 4.0) + http-form_data (~> 2.0) + http_parser.rb (~> 0.6.0) + memoizable (~> 0.4.0) + multipart-post (~> 2.0) + naught (~> 1.0) + simple_oauth (~> 0.3.0) + tzinfo (2.0.6) + concurrent-ruby (~> 1.0) + uglifier (4.2.0) + execjs (>= 0.3.0, < 3) + unf (0.1.4) + unf_ext + unf_ext (0.0.7.7) + unicode-display_width (2.5.0) + unicode_utils (1.4.0) + uniform_notifier (1.14.2) + uri (0.12.2) + user_agent_parser (2.7.0) + vcr (5.0.0) + version_gem (1.1.4) + webmock (3.7.6) + addressable (>= 2.3.6) + crack (>= 0.3.2) + hashdiff (>= 0.4.0, < 2.0.0) + webpacker (5.4.4) + activesupport (>= 5.2) + rack-proxy (>= 0.6.1) + railties (>= 5.2) + semantic_range (>= 2.3.0) + websocket-driver (0.7.6) + websocket-extensions (>= 0.1.0) + websocket-extensions (0.1.5) + zeitwerk (2.6.17) + +PLATFORMS + ruby + x86_64-linux + +DEPENDENCIES + MailchimpMarketing! + active_model_serializers (~> 0.8.3) + annotate + api-pagination + axlsx (~> 3.0.0.pre) + bcrypt (~> 3.1.7) + bootsnap + bootstrap (= 4.0.0.alpha4) + brakeman + bullet + carrierwave (~> 2.2.6) + carrierwave_backgrounder + chartkick + coderay + coffee-rails + database_cleaner + doorkeeper (~> 5.2.5) + doorkeeper-i18n + dotenv-rails + eventmachine + facebookbusiness! + factory_bot_rails + faraday_middleware + fast_blank (~> 1.0) + flamegraph + flipper + flipper-active_record + flipper-ui + fog-aws + foreman + geocoder + grape (~> 1.8.0) + grape-swagger (= 0.11) + grape_logging + groupdate + guard + guard-rspec + hamlit + hashie + honeybadger + httparty + i18n-country-translations + i18n-js + i18n-tasks + i18n_generators + jquery-rails + kaminari + kramdown (= 2.3.1) + kramdown-parser-gfm + letter_opener + lograge + logstash-event + memory_profiler + mini_magick + money-rails (~> 1.11) + multi_json + net-http + oj + omniauth (~> 2.0.0) + omniauth-facebook + omniauth-globalid + omniauth-strava + omniauth-twitter + parallel_tests + paranoia + pg (~> 1.0) + pg_search + postmark-rails + premailer-rails + pry-byebug + pry-rails + puma + rack (~> 2.2.3) + rack-mini-profiler + rack-throttle + rails (~> 7.0.8.4) + rails-assets-Stickyfill (~> 1.1.3)! + rails-assets-jquery (~> 3.4.1)! + rails-assets-jquery.dirtyforms (~> 2.0.0)! + rails-assets-lodash (~> 4.9.0)! + rails-assets-mailcheck (~> 1.1.2)! + rails-assets-moment (~> 2.18.1)! + rails-assets-moment-timezone (~> 0.5.13)! + rails-assets-mustache (~> 2.2.1)! + rails-assets-select2 (~> 4.0.3)! + rails-assets-selectize (~> 0.12.1)! + rails-assets-tether (~> 1.1.0)! + rails-assets-waypoints (~> 3.1.1)! + rails-controller-testing + rails-i18n + rb-fsevent (~> 0.10.3) + redis + redlock + rerun + responders + rqrcode (= 0.10.1) + rspec (~> 3.4) + rspec-rails (~> 4.0) + rspec-retry + rspec-sidekiq + rspec_junit_formatter + sass-rails + secure_headers (~> 2.5.0) + sidekiq + sidekiq-failures + simplecov + sitemap_generator (~> 6) + skylight + sprockets (= 4.0.0) + sprockets-rails + stackprof + standard + stripe + swagger-ui_rails! + terminal-notifier + thor + translation + twilio-ruby + twitter + uglifier + vcr + webmock + webpacker + +RUBY VERSION + ruby 2.7.8p225 + +BUNDLED WITH + 2.4.22 From 1566d7e88e169ab203fcbe889c935171b1635121 Mon Sep 17 00:00:00 2001 From: "G. Torres" <gelsey@ombulabs.com> Date: Tue, 3 Sep 2024 12:06:37 -0400 Subject: [PATCH 02/12] BIB-45: Adds build for next Rails version --- .circleci/config.yml | 283 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 283 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 75a5faca02..6cab31a31e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -309,6 +309,288 @@ jobs: path: /tmp/test-results - store_artifacts: path: coverage + build_next: + working_directory: ~/bikeindex/bike_index + parallelism: 2 + shell: /bin/bash --login + environment: + BUNDLE_GEMFILE: Gemfile.next + RAILS_ENV: test + NODE_ENV: test + RACK_ENV: test + COVERAGE: true + CC_TEST_REPORTER_ID: 04daa6564351115dc1515504790cd379ad8dc25e7778f0641e0f8c63185f887c + TRANSLATION_BRANCH: main + TZ: /usr/share/zoneinfo/America/Chicago + RETRY_FLAKY: true + + docker: + - image: cimg/ruby:2.7.8-node + environment: + PGHOST: 127.0.0.1 + PGUSER: root + PSQL_PAGER: "" + - image: cimg/postgres:13.5-postgis + environment: + POSTGRES_USER: root + POSTGRES_DB: bikeindex_test + POSTGRES_PASSWORD: "" + - image: redis:7.2.3 + + # The resource_class feature allows configuring CPU and RAM resources for each job. Different resource classes are available for different executors. https://circleci.com/docs/2.0/configuration-reference/#resourceclass + resource_class: large + + steps: + - add_ssh_keys: + fingerprints: + - "b7:01:89:de:d8:f8:77:cc:9e:5a:ca:ee:0c:24:57:13" + + - checkout + + - run: + name: "Apt: install system / build dependencies" + command: | + sudo apt-get update + sudo apt-get -y install \ + curl \ + gettext \ + imagemagick \ + libcurl4-gnutls-dev \ + libexpat1-dev \ + libssl-dev \ + libz-dev \ + postgresql-client \ + ripgrep + + - run: + name: "Update Node.js and npm" + command: | + curl -sSL "https://nodejs.org/download/release/v16.20.2/node-v16.20.2-linux-x64.tar.xz" | sudo tar --strip-components=2 -xJ -C /usr/local/bin/ node-v16.20.2-linux-x64/bin/node + # curl https://www.npmjs.com/install.sh | sudo bash + + - restore_cache: + name: "Dockerize: cache restore" + keys: + - CACHE_V4-dockerize-0.6.1 + - CACHE_V4-dockerize- + + - run: + name: "Dockerize: install" + environment: + DOCKERIZE_VERSION: v0.6.1 + command: | + dockerize_tar=dockerize-linux-amd64-${DOCKERIZE_VERSION}.tar.gz + if [[ ! -f ~/.cache/dockerize/${dockerize_tar} ]]; then + wget https://github.com/jwilder/dockerize/releases/download/${DOCKERIZE_VERSION}/${dockerize_tar} + fi + sudo tar -C /usr/local/bin -xzvf ${dockerize_tar} + + - type: cache-save + name: "Dockerize: cache save" + key: CACHE_V4-dockerize-0.6.1 + paths: + - ~/.cache/dockerize + + # Updated all restore_cache to make things more functional when changing a single dependency, see PR#2366 + - restore_cache: + name: "Git: cache restore" + keys: + - CACHE_V4-git-2.22.0 + - CACHE_V4-git- + + - run: + name: "Git: install" + environment: + GIT_VERSION: 2.22.0 + command: | + set -x + + git_binary=~/.cache/git/git-${GIT_VERSION}/git + + if [[ ! -f $git_binary ]]; then + rm -rf ~/.cache/git + mkdir -p ~/.cache/git + cd ~/.cache/git + + wget -O git.tgz https://mirrors.edge.kernel.org/pub/software/scm/git/git-${GIT_VERSION}.tar.gz + tar -xzf git.tgz + cd git-${GIT_VERSION} + + export DEFAULT_HELP_FORMAT="man" + autoconf + ./configure + + sudo make man + sudo make install-man + fi + + cd ~/.cache/git/git-${GIT_VERSION} + sudo make prefix=/usr/local all + sudo make install + sudo cp ${git_binary} /usr/local/bin/git + + - type: cache-save + name: "Git: cache save" + key: CACHE_V4-git-2.22.0 + paths: + - ~/.cache/git/git-2.22.0 + + - restore_cache: + name: "Hub: cache restore" + keys: + - CACHE_V4-hub-2.12.3 + - CACHE_V4-hub- + + - run: + name: "Hub: install" + environment: + HUB_VERSION: 2.12.3 + command: | + set -x + + hub_binary=~/.cache/hub/hub-linux-amd64-${HUB_VERSION}/bin/hub + + if [[ ! -f ${hub_binary} ]]; then + rm -rf ~/.cache/hub + mkdir -p ~/.cache/hub + cd ~/.cache/hub + + wget -O hub.tgz https://github.com/github/hub/releases/download/v${HUB_VERSION}/hub-linux-amd64-${HUB_VERSION}.tgz + tar -xzf hub.tgz + fi + + sudo cp ${hub_binary} /usr/local/bin/hub + + - restore_cache: + name: "Hub: cache save" + keys: + - CACHE_V4-hub-2.12.3 + - CACHE_V4-hub- + paths: + - ~/.cache/hub + + - run: + name: "Bundler: install" + command: gem install bundler -v 2.4.22 + + - restore_cache: + name: "Ruby dependencies: cache restore" + keys: + - CACHE_V4-gems-{{ checksum "Gemfile.lock" }} + - CACHE_V4-gems- + + - run: + name: "Ruby dependencies: install" + command: | + set -x + bundle config set --local path '~/.cache/bundle' + bundle install + + - type: cache-save + name: "Ruby dependencies: cache save" + key: CACHE_V4-gems-{{ checksum "Gemfile.lock" }} + paths: + - ~/.cache/bundle + + - run: + name: Sync translations (only on main by default) + command: bin/check_translations + + - restore_cache: + name: "Node dependencies: cache restore" + keys: + - CACHE_V4-yarn-{{ checksum "yarn.lock" }} + - CACHE_V4-yarn- + + - run: + name: "Node dependencies: install" + command: | + set -x + [[ -d ~/.cache/yarn ]] && use_local="--prefer-offline" + yarn install --cache-folder ~/.cache/yarn $use_local + + - type: cache-save + name: "Node dependencies: cache save" + key: CACHE_V4-yarn-{{ checksum "yarn.lock" }} + paths: + - ~/.cache/yarn + + - restore_cache: + name: "Assets: cache restore" + keys: + - CACHE_V4-assets-{{ .Environment.CIRCLE_SHA1 }} + - CACHE_V4-assets- + + - run: + name: "Assets: precompile" + command: | + set -x + node --version + bin/webpack + bundle exec rails assets:precompile assets:clean --trace + + - type: cache-save + name: "Assets: cache save" + key: CACHE_V4-assets-{{ .Environment.CIRCLE_SHA1 }} + paths: + - .sass-cache + - public/assets + - public/packs + - public/packs-test + - tmp/cache/assets + - tmp/cache/webpacker + + - run: + name: Install Code Climate Test Reporter + command: | + curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter + chmod +x ./cc-test-reporter + + - run: + name: Wait for PostgreSQL to start + command: dockerize -wait tcp://localhost:5432 -timeout 1m + + - run: + name: Setup Database + command: | + bundle exec rails db:create --trace + bundle exec rails db:structure:load --trace + + - run: + name: RSpec + command: | + mkdir -p /tmp/test-results/rspec coverage + ./cc-test-reporter before-build + RSPEC_CMD="bundle exec rspec --profile 10 --order random --format RspecJunitFormatter --out /tmp/test-results/rspec/rspec.xml --format progress --color --require spec_helper" + circleci tests glob "spec/**/*_spec.rb" | circleci tests run --command="xargs $RSPEC_CMD" --verbose --split-by=timings + - run: + name: Save Code Climate Test Coverage + # If there is a codeclimate json file, persist it to the workspace + # If not (e.g. when rerunning failed tests), create a file indicating that (required by persist_to_workspace) + command: | + if [ -f "coverage/codeclimate.$CIRCLE_NODE_INDEX.json" ]; then + ./cc-test-reporter format-coverage -t simplecov -o "coverage/codeclimate.$CIRCLE_NODE_INDEX.json" + else + echo "Coverage file doesn't exist" + touch coverage/codeclimate.no-coverage.json + ls -lah coverage/ + fi + - persist_to_workspace: + root: coverage + paths: + - codeclimate.*.json + - run: + name: "Jest: Tests" + command: | + mkdir -p /tmp/test-results/junit + yarn jest --ci --runInBand --reporters=default --reporters=jest-junit + environment: + JEST_JUNIT_OUTPUT: "/tmp/test-results/junit/js-test-results.xml" # This is the env variable for the old version of jest-junit + JEST_JUNIT_OUTPUT_DIR: "/tmp/test-results/junit/" + - store_test_results: + path: /tmp/test-results + - store_artifacts: + path: coverage upload-coverage: docker: @@ -350,6 +632,7 @@ workflows: commit: jobs: - build + - build_next - brakeman_scan - upload-coverage: requires: From 4e25fc8a29a4e95c3d59f8c91724036e893781f1 Mon Sep 17 00:00:00 2001 From: "G. Torres" <gelsey@ombulabs.com> Date: Tue, 3 Sep 2024 12:22:25 -0400 Subject: [PATCH 03/12] BIB-45: Adds rails db:schema:load because db:structure:load is deprecated and removed in Rails 7 --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 6cab31a31e..8b7c11ba75 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -554,7 +554,7 @@ jobs: name: Setup Database command: | bundle exec rails db:create --trace - bundle exec rails db:structure:load --trace + bundle exec rails db:schema:load --trace - run: name: RSpec From 23bf9939ff7eb1dc3944958ace7733a615fe8353 Mon Sep 17 00:00:00 2001 From: "G. Torres" <gelsey@ombulabs.com> Date: Tue, 3 Sep 2024 16:58:40 -0400 Subject: [PATCH 04/12] BIB-49: Removes the dual boot code and makes Rails 7 the only version --- Gemfile | 10 +- Gemfile.next | 1 - Gemfile.next.lock | 909 ---------------------------------------------- 3 files changed, 1 insertion(+), 919 deletions(-) delete mode 120000 Gemfile.next delete mode 100644 Gemfile.next.lock diff --git a/Gemfile b/Gemfile index 0a4cb13f69..48ebb1d89c 100644 --- a/Gemfile +++ b/Gemfile @@ -1,9 +1,5 @@ # frozen_string_literal: true -def next? - File.basename(__FILE__) == "Gemfile.next" -end - source "https://rubygems.org" git_source(:github) { |repo| "https://github.com/#{repo}.git" } @@ -13,11 +9,7 @@ git_source(:gitlab) { |repo| "https://gitlab.com/#{repo}.git" } ruby "2.7.8" gem "rack", "~> 2.2.3" -if next? - gem "rails", "~> 7.0.8.4" -else - gem "rails", "~> 6.0" -end +gem "rails", "~> 7.0.8.4" gem "puma" # App server gem "bcrypt", "~> 3.1.7" # encryption diff --git a/Gemfile.next b/Gemfile.next deleted file mode 120000 index 6ab79009c0..0000000000 --- a/Gemfile.next +++ /dev/null @@ -1 +0,0 @@ -Gemfile \ No newline at end of file diff --git a/Gemfile.next.lock b/Gemfile.next.lock deleted file mode 100644 index 91e5e5423d..0000000000 --- a/Gemfile.next.lock +++ /dev/null @@ -1,909 +0,0 @@ -GIT - remote: https://github.com/bikeindex/swagger-ui_rails.git - revision: 0377d8ecd0714901351a6bfc68491d255ad86093 - branch: bike_index_0.1.7 - specs: - swagger-ui_rails (0.1.7) - -GIT - remote: https://github.com/facebook/facebook-ruby-business-sdk.git - revision: c64b51f862c2359d289a9aea6d317cf1218595aa - branch: main - specs: - facebookbusiness (0.15.0.2) - concurrent-ruby (~> 1.1) - countries (~> 3.0) - faraday (~> 1.0) - json (~> 2.2) - money (~> 6.13) - -GIT - remote: https://github.com/mailchimp/mailchimp-marketing-ruby.git - revision: 2cd67937bff16b42d38e0b0a918b4f2014c1a98c - specs: - MailchimpMarketing (3.0.48) - excon (~> 0.76.0) - json (~> 2.1, >= 2.1.0) - -GEM - remote: https://rails-assets.org/ - specs: - rails-assets-Stickyfill (1.1.4) - rails-assets-jquery (3.4.1) - rails-assets-jquery.dirtyforms (2.0.0) - rails-assets-jquery (>= 1.4.2) - rails-assets-lodash (4.9.0) - rails-assets-mailcheck (1.1.2) - rails-assets-microplugin (0.0.3) - rails-assets-moment (2.18.1) - rails-assets-moment-timezone (0.5.25) - rails-assets-moment (>= 2.9.0) - rails-assets-mustache (2.2.1) - rails-assets-select2 (4.0.8) - rails-assets-selectize (0.12.6) - rails-assets-jquery (>= 1.7.0) - rails-assets-microplugin (~> 0.0.0) - rails-assets-sifter (~> 0.5.0) - rails-assets-sifter (0.5.3) - rails-assets-tether (1.1.1) - rails-assets-waypoints (3.1.1) - -GEM - remote: https://rubygems.org/ - specs: - actioncable (7.0.8.4) - actionpack (= 7.0.8.4) - activesupport (= 7.0.8.4) - nio4r (~> 2.0) - websocket-driver (>= 0.6.1) - actionmailbox (7.0.8.4) - actionpack (= 7.0.8.4) - activejob (= 7.0.8.4) - activerecord (= 7.0.8.4) - activestorage (= 7.0.8.4) - activesupport (= 7.0.8.4) - mail (>= 2.7.1) - net-imap - net-pop - net-smtp - actionmailer (7.0.8.4) - actionpack (= 7.0.8.4) - actionview (= 7.0.8.4) - activejob (= 7.0.8.4) - activesupport (= 7.0.8.4) - mail (~> 2.5, >= 2.5.4) - net-imap - net-pop - net-smtp - rails-dom-testing (~> 2.0) - actionpack (7.0.8.4) - actionview (= 7.0.8.4) - activesupport (= 7.0.8.4) - rack (~> 2.0, >= 2.2.4) - rack-test (>= 0.6.3) - rails-dom-testing (~> 2.0) - rails-html-sanitizer (~> 1.0, >= 1.2.0) - actiontext (7.0.8.4) - actionpack (= 7.0.8.4) - activerecord (= 7.0.8.4) - activestorage (= 7.0.8.4) - activesupport (= 7.0.8.4) - globalid (>= 0.6.0) - nokogiri (>= 1.8.5) - actionview (7.0.8.4) - activesupport (= 7.0.8.4) - builder (~> 3.1) - erubi (~> 1.4) - rails-dom-testing (~> 2.0) - rails-html-sanitizer (~> 1.1, >= 1.2.0) - active_model_serializers (0.8.4) - activemodel (>= 3.0) - activejob (7.0.8.4) - activesupport (= 7.0.8.4) - globalid (>= 0.3.6) - activemodel (7.0.8.4) - activesupport (= 7.0.8.4) - activerecord (7.0.8.4) - activemodel (= 7.0.8.4) - activesupport (= 7.0.8.4) - activestorage (7.0.8.4) - actionpack (= 7.0.8.4) - activejob (= 7.0.8.4) - activerecord (= 7.0.8.4) - activesupport (= 7.0.8.4) - marcel (~> 1.0) - mini_mime (>= 1.1.0) - activesupport (7.0.8.4) - concurrent-ruby (~> 1.0, >= 1.0.2) - i18n (>= 1.6, < 2) - minitest (>= 5.1) - tzinfo (~> 2.0) - addressable (2.8.7) - public_suffix (>= 2.0.2, < 7.0) - annotate (3.2.0) - activerecord (>= 3.2, < 8.0) - rake (>= 10.4, < 14.0) - api-pagination (5.0.0) - ast (2.4.2) - autoprefixer-rails (9.7.3) - execjs - axlsx (3.0.0.pre) - htmlentities (~> 4.3, >= 4.3.4) - mimemagic (~> 0.3) - nokogiri (~> 1.8, >= 1.8.2) - rubyzip (~> 1.2, >= 1.2.1) - bcrypt (3.1.13) - better_html (2.0.2) - actionview (>= 6.0) - activesupport (>= 6.0) - ast (~> 2.0) - erubi (~> 1.4) - parser (>= 2.4) - smart_properties - bigdecimal (3.1.5) - bootsnap (1.16.0) - msgpack (~> 1.2) - bootstrap (4.0.0.alpha4) - autoprefixer-rails (>= 6.0.3) - sass (>= 3.4.19) - brakeman (5.4.1) - buftok (0.2.0) - builder (3.3.0) - bullet (7.0.1) - activesupport (>= 3.0.0) - uniform_notifier (~> 1.11) - byebug (11.1.3) - carrierwave (2.2.6) - activemodel (>= 5.0.0) - activesupport (>= 5.0.0) - addressable (~> 2.6) - image_processing (~> 1.1) - marcel (~> 1.0.0) - mini_mime (>= 0.1.3) - ssrf_filter (~> 1.0) - carrierwave_backgrounder (1.0.2) - carrierwave (> 2.0, < 4.0) - rails (> 6.0, < 8.0) - chartkick (4.1.3) - chunky_png (1.4.0) - coderay (1.1.3) - coffee-rails (4.2.2) - coffee-script (>= 2.2.0) - railties (>= 4.0.0) - coffee-script (2.4.1) - coffee-script-source - execjs - coffee-script-source (1.12.2) - concurrent-ruby (1.3.4) - connection_pool (2.4.1) - countries (3.1.0) - i18n_data (~> 0.11.0) - sixarm_ruby_unaccent (~> 1.1) - unicode_utils (~> 1.4) - crack (0.4.3) - safe_yaml (~> 1.0.0) - crass (1.0.6) - css_parser (1.7.1) - addressable - database_cleaner (1.7.0) - date (3.3.4) - diff-lcs (1.4.4) - docile (1.4.0) - domain_name (0.5.20190701) - unf (>= 0.0.5, < 1.0.0) - doorkeeper (5.2.6) - railties (>= 5) - doorkeeper-i18n (5.2.2) - doorkeeper (>= 5.2) - dotenv (2.7.6) - dotenv-rails (2.7.6) - dotenv (= 2.7.6) - railties (>= 3.2) - dry-core (1.0.0) - concurrent-ruby (~> 1.0) - zeitwerk (~> 2.6) - dry-inflector (1.0.0) - dry-logic (1.5.0) - concurrent-ruby (~> 1.0) - dry-core (~> 1.0, < 2) - zeitwerk (~> 2.6) - dry-types (1.7.1) - concurrent-ruby (~> 1.0) - dry-core (~> 1.0) - dry-inflector (~> 1.0) - dry-logic (~> 1.4) - zeitwerk (~> 2.6) - equalizer (0.0.11) - erubi (1.13.0) - eventmachine (1.2.7) - excon (0.76.0) - execjs (2.7.0) - factory_bot (6.2.1) - activesupport (>= 5.0.0) - factory_bot_rails (6.2.0) - factory_bot (~> 6.2.0) - railties (>= 5.0.0) - faraday (1.10.3) - faraday-em_http (~> 1.0) - faraday-em_synchrony (~> 1.0) - faraday-excon (~> 1.1) - faraday-httpclient (~> 1.0) - faraday-multipart (~> 1.0) - faraday-net_http (~> 1.0) - faraday-net_http_persistent (~> 1.0) - faraday-patron (~> 1.0) - faraday-rack (~> 1.0) - faraday-retry (~> 1.0) - ruby2_keywords (>= 0.0.4) - faraday-em_http (1.0.0) - faraday-em_synchrony (1.0.0) - faraday-excon (1.1.0) - faraday-httpclient (1.0.1) - faraday-multipart (1.0.4) - multipart-post (~> 2) - faraday-net_http (1.0.1) - faraday-net_http_persistent (1.2.0) - faraday-patron (1.0.0) - faraday-rack (1.0.0) - faraday-retry (1.0.3) - faraday_middleware (1.0.0) - faraday (~> 1.0) - fast_blank (1.0.0) - ffi (1.17.0) - ffi-compiler (1.0.1) - ffi (>= 1.0.0) - rake - flamegraph (0.9.5) - flipper (1.3.0) - concurrent-ruby (< 2) - flipper-active_record (1.3.0) - activerecord (>= 4.2, < 8) - flipper (~> 1.3.0) - flipper-ui (1.3.0) - erubi (>= 1.0.0, < 2.0.0) - flipper (~> 1.3.0) - rack (>= 1.4, < 4) - rack-protection (>= 1.5.3, < 5.0.0) - rack-session (>= 1.0.2, < 3.0.0) - sanitize (< 7) - fog-aws (3.24.0) - fog-core (~> 2.1) - fog-json (~> 1.1) - fog-xml (~> 0.1) - fog-core (2.5.0) - builder - excon (~> 0.71) - formatador (>= 0.2, < 2.0) - mime-types - fog-json (1.2.0) - fog-core - multi_json (~> 1.10) - fog-xml (0.1.4) - fog-core - nokogiri (>= 1.5.11, < 2.0.0) - foreman (0.86.0) - formatador (1.1.0) - geocoder (1.6.1) - gettext (3.3.7) - locale (>= 2.0.5) - text (>= 1.3.0) - globalid (1.2.1) - activesupport (>= 6.1) - grape (1.8.0) - activesupport (>= 5) - builder - dry-types (>= 1.1) - mustermann-grape (~> 1.0.0) - rack (>= 1.3.0) - rack-accept - grape-entity (0.4.8) - activesupport - multi_json (>= 1.3.2) - grape-swagger (0.11.0) - grape (>= 0.16.2) - grape-entity (< 0.5.0) - grape_logging (1.8.4) - grape - rack - groupdate (6.0.1) - activesupport (>= 5.2) - guard (2.16.2) - formatador (>= 0.2.4) - listen (>= 2.7, < 4.0) - lumberjack (>= 1.0.12, < 2.0) - nenv (~> 0.1) - notiffany (~> 0.0) - pry (>= 0.9.12) - shellany (~> 0.0) - thor (>= 0.18.1) - guard-compat (1.2.1) - guard-rspec (4.7.3) - guard (~> 2.1) - guard-compat (~> 1.1) - rspec (>= 2.99.0, < 4.0) - hamlit (2.16.0) - temple (>= 0.8.2) - thor - tilt - hashdiff (1.0.0) - hashie (5.0.0) - highline (2.1.0) - honeybadger (4.5.4) - htmlentities (4.3.4) - http (4.4.1) - addressable (~> 2.3) - http-cookie (~> 1.0) - http-form_data (~> 2.2) - http-parser (~> 1.2.0) - http-cookie (1.0.3) - domain_name (~> 0.5) - http-form_data (2.3.0) - http-parser (1.2.3) - ffi-compiler (>= 1.0, < 2.0) - http_parser.rb (0.6.0) - httparty (0.16.2) - multi_xml (>= 0.5.2) - i18n (1.14.5) - concurrent-ruby (~> 1.0) - i18n-country-translations (1.4.1) - i18n (>= 0.9.3, < 2) - railties (>= 5.0) - i18n-js (3.5.0) - i18n (>= 0.6.6) - i18n-tasks (1.0.13) - activesupport (>= 4.0.2) - ast (>= 2.1.0) - better_html (>= 1.0, < 3.0) - erubi - highline (>= 2.0.0) - i18n - parser (>= 3.2.2.1) - rails-i18n - rainbow (>= 2.2.2, < 4.0) - terminal-table (>= 1.5.1) - i18n_data (0.11.0) - i18n_generators (2.2.2) - activerecord (>= 3.0.0) - railties (>= 3.0.0) - image_processing (1.13.0) - mini_magick (>= 4.9.5, < 5) - ruby-vips (>= 2.0.17, < 3) - jquery-rails (4.3.5) - rails-dom-testing (>= 1, < 3) - railties (>= 4.2.0) - thor (>= 0.14, < 2.0) - json (2.7.0) - jwt (2.2.2) - kaminari (1.2.2) - activesupport (>= 4.1.0) - kaminari-actionview (= 1.2.2) - kaminari-activerecord (= 1.2.2) - kaminari-core (= 1.2.2) - kaminari-actionview (1.2.2) - actionview - kaminari-core (= 1.2.2) - kaminari-activerecord (1.2.2) - activerecord - kaminari-core (= 1.2.2) - kaminari-core (1.2.2) - kramdown (2.3.1) - rexml - kramdown-parser-gfm (1.1.0) - kramdown (~> 2.0) - launchy (2.5.2) - addressable (~> 2.8) - letter_opener (1.8.1) - launchy (>= 2.2, < 3) - listen (3.8.0) - rb-fsevent (~> 0.10, >= 0.10.3) - rb-inotify (~> 0.9, >= 0.9.10) - locale (2.1.3) - logger (1.6.0) - lograge (0.14.0) - actionpack (>= 4) - activesupport (>= 4) - railties (>= 4) - request_store (~> 1.0) - logstash-event (1.2.02) - loofah (2.22.0) - crass (~> 1.0.2) - nokogiri (>= 1.12.0) - lumberjack (1.2.8) - mail (2.8.1) - mini_mime (>= 0.1.1) - net-imap - net-pop - net-smtp - marcel (1.0.4) - memoizable (0.4.2) - thread_safe (~> 0.3, >= 0.3.1) - memory_profiler (0.9.14) - method_source (1.1.0) - mime-types (3.5.2) - mime-types-data (~> 3.2015) - mime-types-data (3.2024.0820) - mimemagic (0.4.3) - nokogiri (~> 1) - rake - mini_magick (4.13.2) - mini_mime (1.1.5) - mini_portile2 (2.8.7) - minitest (5.25.1) - monetize (1.12.0) - money (~> 6.12) - money (6.16.0) - i18n (>= 0.6.4, <= 2) - money-rails (1.15.0) - activesupport (>= 3.0) - monetize (~> 1.9) - money (~> 6.13) - railties (>= 3.0) - msgpack (1.7.2) - multi_json (1.15.0) - multi_xml (0.6.0) - multipart-post (2.3.0) - mustermann (3.0.0) - ruby2_keywords (~> 0.0.1) - mustermann-grape (1.0.2) - mustermann (>= 1.0.0) - naught (1.1.0) - nenv (0.3.0) - net-http (0.3.2) - uri - net-imap (0.4.14) - date - net-protocol - net-pop (0.1.2) - net-protocol - net-protocol (0.2.2) - timeout - net-smtp (0.5.0) - net-protocol - nio4r (2.7.3) - nokogiri (1.15.6) - mini_portile2 (~> 2.8.2) - racc (~> 1.4) - nokogiri (1.15.6-x86_64-linux) - racc (~> 1.4) - notiffany (0.1.3) - nenv (~> 0.1) - shellany (~> 0.0) - oauth (1.1.0) - oauth-tty (~> 1.0, >= 1.0.1) - snaky_hash (~> 2.0) - version_gem (~> 1.1) - oauth-tty (1.0.5) - version_gem (~> 1.1, >= 1.1.1) - oauth2 (1.4.4) - faraday (>= 0.8, < 2.0) - jwt (>= 1.0, < 3.0) - multi_json (~> 1.3) - multi_xml (~> 0.5) - rack (>= 1.2, < 3) - oj (3.16.3) - bigdecimal (>= 3.0) - omniauth (2.0.4) - hashie (>= 3.4.6) - rack (>= 1.6.2, < 3) - rack-protection - omniauth-facebook (5.0.0) - omniauth-oauth2 (~> 1.2) - omniauth-globalid (0.0.2) - omniauth-oauth (~> 1.1) - rack - omniauth-oauth (1.2.0) - oauth - omniauth (>= 1.0, < 3) - omniauth-oauth2 (1.8.0) - oauth2 (>= 1.4, < 3) - omniauth (~> 2.0) - omniauth-strava (1.0.0) - omniauth (~> 2.0) - omniauth-oauth2 (~> 1.0) - omniauth-twitter (1.4.0) - omniauth-oauth (~> 1.1) - rack - parallel (1.22.1) - parallel_tests (2.30.0) - parallel - paranoia (2.5.2) - activerecord (>= 5.1, < 7.1) - parser (3.2.2.4) - ast (~> 2.4.1) - racc - pg (1.5.6) - pg_search (2.3.6) - activerecord (>= 5.2) - activesupport (>= 5.2) - postmark (1.22.0) - json - postmark-rails (0.21.0) - actionmailer (>= 3.0.0) - postmark (>= 1.21.3, < 2.0) - premailer (1.11.1) - addressable - css_parser (>= 1.6.0) - htmlentities (>= 4.0.0) - premailer-rails (1.10.3) - actionmailer (>= 3) - premailer (~> 1.7, >= 1.7.9) - pry (0.14.2) - coderay (~> 1.1) - method_source (~> 1.0) - pry-byebug (3.10.1) - byebug (~> 11.0) - pry (>= 0.13, < 0.15) - pry-rails (0.3.9) - pry (>= 0.10.4) - public_suffix (5.1.1) - puma (6.3.1) - nio4r (~> 2.0) - racc (1.8.1) - rack (2.2.9) - rack-accept (0.4.5) - rack (>= 0.4) - rack-mini-profiler (2.3.1) - rack (>= 1.2.0) - rack-protection (2.0.8.1) - rack - rack-proxy (0.7.7) - rack - rack-session (1.0.2) - rack (< 3) - rack-test (2.1.0) - rack (>= 1.3) - rack-throttle (0.7.0) - bundler (>= 1.0.0) - rack (>= 1.0.0) - rails (7.0.8.4) - actioncable (= 7.0.8.4) - actionmailbox (= 7.0.8.4) - actionmailer (= 7.0.8.4) - actionpack (= 7.0.8.4) - actiontext (= 7.0.8.4) - actionview (= 7.0.8.4) - activejob (= 7.0.8.4) - activemodel (= 7.0.8.4) - activerecord (= 7.0.8.4) - activestorage (= 7.0.8.4) - activesupport (= 7.0.8.4) - bundler (>= 1.15.0) - railties (= 7.0.8.4) - rails-controller-testing (1.0.4) - actionpack (>= 5.0.1.x) - actionview (>= 5.0.1.x) - activesupport (>= 5.0.1.x) - rails-dom-testing (2.2.0) - activesupport (>= 5.0.0) - minitest - nokogiri (>= 1.6) - rails-html-sanitizer (1.6.0) - loofah (~> 2.21) - nokogiri (~> 1.14) - rails-i18n (7.0.8) - i18n (>= 0.7, < 2) - railties (>= 6.0.0, < 8) - railties (7.0.8.4) - actionpack (= 7.0.8.4) - activesupport (= 7.0.8.4) - method_source - rake (>= 12.2) - thor (~> 1.0) - zeitwerk (~> 2.5) - rainbow (3.1.1) - rake (13.2.1) - rb-fsevent (0.10.4) - rb-inotify (0.10.1) - ffi (~> 1.0) - redis (5.0.8) - redis-client (>= 0.17.0) - redis-client (0.17.1) - connection_pool - redlock (2.0.6) - redis-client (>= 0.14.1, < 1.0.0) - regexp_parser (2.5.0) - request_store (1.5.1) - rack (>= 1.4) - rerun (0.14.0) - listen (~> 3.0) - responders (3.0.1) - actionpack (>= 5.0) - railties (>= 5.0) - rexml (3.2.5) - rqrcode (0.10.1) - chunky_png (~> 1.0) - rspec (3.9.0) - rspec-core (~> 3.9.0) - rspec-expectations (~> 3.9.0) - rspec-mocks (~> 3.9.0) - rspec-core (3.9.3) - rspec-support (~> 3.9.3) - rspec-expectations (3.9.4) - diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.9.0) - rspec-mocks (3.9.1) - diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.9.0) - rspec-rails (4.0.1) - actionpack (>= 4.2) - activesupport (>= 4.2) - railties (>= 4.2) - rspec-core (~> 3.9) - rspec-expectations (~> 3.9) - rspec-mocks (~> 3.9) - rspec-support (~> 3.9) - rspec-retry (0.6.2) - rspec-core (> 3.3) - rspec-sidekiq (3.0.3) - rspec-core (~> 3.0, >= 3.0.0) - sidekiq (>= 2.4.0) - rspec-support (3.9.4) - rspec_junit_formatter (0.4.1) - rspec-core (>= 2, < 4, != 2.12.0) - rubocop (1.32.0) - json (~> 2.3) - parallel (~> 1.10) - parser (>= 3.1.0.0) - rainbow (>= 2.2.2, < 4.0) - regexp_parser (>= 1.8, < 3.0) - rexml (>= 3.2.5, < 4.0) - rubocop-ast (>= 1.19.1, < 2.0) - ruby-progressbar (~> 1.7) - unicode-display_width (>= 1.4.0, < 3.0) - rubocop-ast (1.21.0) - parser (>= 3.1.1.0) - rubocop-performance (1.14.3) - rubocop (>= 1.7.0, < 2.0) - rubocop-ast (>= 0.4.0) - ruby-progressbar (1.11.0) - ruby-vips (2.2.2) - ffi (~> 1.12) - logger - ruby2_keywords (0.0.5) - rubyzip (1.3.0) - safe_yaml (1.0.5) - sanitize (6.1.1) - crass (~> 1.0.2) - nokogiri (>= 1.12.0) - sass (3.7.4) - sass-listen (~> 4.0.0) - sass-listen (4.0.0) - rb-fsevent (~> 0.9, >= 0.9.4) - rb-inotify (~> 0.9, >= 0.9.7) - sass-rails (6.0.0) - sassc-rails (~> 2.1, >= 2.1.1) - sassc (2.4.0) - ffi (~> 1.9) - sassc-rails (2.1.2) - railties (>= 4.0.0) - sassc (>= 2.0) - sprockets (> 3.0) - sprockets-rails - tilt - secure_headers (2.5.3) - user_agent_parser - semantic_range (3.0.0) - shellany (0.0.1) - sidekiq (6.5.5) - connection_pool (>= 2.2.2) - rack (~> 2.0) - redis (>= 4.5.0) - sidekiq-failures (1.0.0) - sidekiq (>= 4.0.0) - simple_oauth (0.3.1) - simplecov (0.22.0) - docile (~> 1.1) - simplecov-html (~> 0.11) - simplecov_json_formatter (~> 0.1) - simplecov-html (0.12.3) - simplecov_json_formatter (0.1.4) - sitemap_generator (6.1.2) - builder (~> 3.0) - sixarm_ruby_unaccent (1.2.0) - skylight (5.3.4) - activesupport (>= 5.2.0) - smart_properties (1.17.0) - snaky_hash (2.0.1) - hashie - version_gem (~> 1.1, >= 1.1.1) - sprockets (4.0.0) - concurrent-ruby (~> 1.0) - rack (> 1, < 3) - sprockets-rails (3.5.2) - actionpack (>= 6.1) - activesupport (>= 6.1) - sprockets (>= 3.0.0) - ssrf_filter (1.1.2) - stackprof (0.2.14) - standard (1.14.0) - rubocop (= 1.32.0) - rubocop-performance (= 1.14.3) - stripe (5.35.0) - temple (0.8.2) - terminal-notifier (2.0.0) - terminal-table (3.0.2) - unicode-display_width (>= 1.1.1, < 3) - text (1.3.1) - thor (1.3.1) - thread_safe (0.3.6) - tilt (2.3.0) - timeout (0.4.1) - translation (1.26) - gettext (~> 3.2, >= 3.2.5, <= 3.3.7) - twilio-ruby (5.40.4) - faraday (>= 0.9, < 2.0) - jwt (>= 1.5, <= 2.5) - nokogiri (>= 1.6, < 2.0) - twitter (7.0.0) - addressable (~> 2.3) - buftok (~> 0.2.0) - equalizer (~> 0.0.11) - http (~> 4.0) - http-form_data (~> 2.0) - http_parser.rb (~> 0.6.0) - memoizable (~> 0.4.0) - multipart-post (~> 2.0) - naught (~> 1.0) - simple_oauth (~> 0.3.0) - tzinfo (2.0.6) - concurrent-ruby (~> 1.0) - uglifier (4.2.0) - execjs (>= 0.3.0, < 3) - unf (0.1.4) - unf_ext - unf_ext (0.0.7.7) - unicode-display_width (2.5.0) - unicode_utils (1.4.0) - uniform_notifier (1.14.2) - uri (0.12.2) - user_agent_parser (2.7.0) - vcr (5.0.0) - version_gem (1.1.4) - webmock (3.7.6) - addressable (>= 2.3.6) - crack (>= 0.3.2) - hashdiff (>= 0.4.0, < 2.0.0) - webpacker (5.4.4) - activesupport (>= 5.2) - rack-proxy (>= 0.6.1) - railties (>= 5.2) - semantic_range (>= 2.3.0) - websocket-driver (0.7.6) - websocket-extensions (>= 0.1.0) - websocket-extensions (0.1.5) - zeitwerk (2.6.17) - -PLATFORMS - ruby - x86_64-linux - -DEPENDENCIES - MailchimpMarketing! - active_model_serializers (~> 0.8.3) - annotate - api-pagination - axlsx (~> 3.0.0.pre) - bcrypt (~> 3.1.7) - bootsnap - bootstrap (= 4.0.0.alpha4) - brakeman - bullet - carrierwave (~> 2.2.6) - carrierwave_backgrounder - chartkick - coderay - coffee-rails - database_cleaner - doorkeeper (~> 5.2.5) - doorkeeper-i18n - dotenv-rails - eventmachine - facebookbusiness! - factory_bot_rails - faraday_middleware - fast_blank (~> 1.0) - flamegraph - flipper - flipper-active_record - flipper-ui - fog-aws - foreman - geocoder - grape (~> 1.8.0) - grape-swagger (= 0.11) - grape_logging - groupdate - guard - guard-rspec - hamlit - hashie - honeybadger - httparty - i18n-country-translations - i18n-js - i18n-tasks - i18n_generators - jquery-rails - kaminari - kramdown (= 2.3.1) - kramdown-parser-gfm - letter_opener - lograge - logstash-event - memory_profiler - mini_magick - money-rails (~> 1.11) - multi_json - net-http - oj - omniauth (~> 2.0.0) - omniauth-facebook - omniauth-globalid - omniauth-strava - omniauth-twitter - parallel_tests - paranoia - pg (~> 1.0) - pg_search - postmark-rails - premailer-rails - pry-byebug - pry-rails - puma - rack (~> 2.2.3) - rack-mini-profiler - rack-throttle - rails (~> 7.0.8.4) - rails-assets-Stickyfill (~> 1.1.3)! - rails-assets-jquery (~> 3.4.1)! - rails-assets-jquery.dirtyforms (~> 2.0.0)! - rails-assets-lodash (~> 4.9.0)! - rails-assets-mailcheck (~> 1.1.2)! - rails-assets-moment (~> 2.18.1)! - rails-assets-moment-timezone (~> 0.5.13)! - rails-assets-mustache (~> 2.2.1)! - rails-assets-select2 (~> 4.0.3)! - rails-assets-selectize (~> 0.12.1)! - rails-assets-tether (~> 1.1.0)! - rails-assets-waypoints (~> 3.1.1)! - rails-controller-testing - rails-i18n - rb-fsevent (~> 0.10.3) - redis - redlock - rerun - responders - rqrcode (= 0.10.1) - rspec (~> 3.4) - rspec-rails (~> 4.0) - rspec-retry - rspec-sidekiq - rspec_junit_formatter - sass-rails - secure_headers (~> 2.5.0) - sidekiq - sidekiq-failures - simplecov - sitemap_generator (~> 6) - skylight - sprockets (= 4.0.0) - sprockets-rails - stackprof - standard - stripe - swagger-ui_rails! - terminal-notifier - thor - translation - twilio-ruby - twitter - uglifier - vcr - webmock - webpacker - -RUBY VERSION - ruby 2.7.8p225 - -BUNDLED WITH - 2.4.22 From f4780ddba66eba9b24d14b3b649869be1f01f9e3 Mon Sep 17 00:00:00 2001 From: "G. Torres" <gelsey@ombulabs.com> Date: Tue, 3 Sep 2024 17:01:46 -0400 Subject: [PATCH 05/12] BIB-49: Removes next_rails job --- .circleci/config.yml | 285 +------------------------------------------ 1 file changed, 1 insertion(+), 284 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 8b7c11ba75..db48114623 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -268,288 +268,6 @@ jobs: name: Wait for PostgreSQL to start command: dockerize -wait tcp://localhost:5432 -timeout 1m - - run: - name: Setup Database - command: | - bundle exec rails db:create --trace - bundle exec rails db:structure:load --trace - - - run: - name: RSpec - command: | - mkdir -p /tmp/test-results/rspec coverage - ./cc-test-reporter before-build - RSPEC_CMD="bundle exec rspec --profile 10 --order random --format RspecJunitFormatter --out /tmp/test-results/rspec/rspec.xml --format progress --color --require spec_helper" - circleci tests glob "spec/**/*_spec.rb" | circleci tests run --command="xargs $RSPEC_CMD" --verbose --split-by=timings - - run: - name: Save Code Climate Test Coverage - # If there is a codeclimate json file, persist it to the workspace - # If not (e.g. when rerunning failed tests), create a file indicating that (required by persist_to_workspace) - command: | - if [ -f "coverage/codeclimate.$CIRCLE_NODE_INDEX.json" ]; then - ./cc-test-reporter format-coverage -t simplecov -o "coverage/codeclimate.$CIRCLE_NODE_INDEX.json" - else - echo "Coverage file doesn't exist" - touch coverage/codeclimate.no-coverage.json - ls -lah coverage/ - fi - - persist_to_workspace: - root: coverage - paths: - - codeclimate.*.json - - run: - name: "Jest: Tests" - command: | - mkdir -p /tmp/test-results/junit - yarn jest --ci --runInBand --reporters=default --reporters=jest-junit - environment: - JEST_JUNIT_OUTPUT: "/tmp/test-results/junit/js-test-results.xml" # This is the env variable for the old version of jest-junit - JEST_JUNIT_OUTPUT_DIR: "/tmp/test-results/junit/" - - store_test_results: - path: /tmp/test-results - - store_artifacts: - path: coverage - build_next: - working_directory: ~/bikeindex/bike_index - parallelism: 2 - shell: /bin/bash --login - environment: - BUNDLE_GEMFILE: Gemfile.next - RAILS_ENV: test - NODE_ENV: test - RACK_ENV: test - COVERAGE: true - CC_TEST_REPORTER_ID: 04daa6564351115dc1515504790cd379ad8dc25e7778f0641e0f8c63185f887c - TRANSLATION_BRANCH: main - TZ: /usr/share/zoneinfo/America/Chicago - RETRY_FLAKY: true - - docker: - - image: cimg/ruby:2.7.8-node - environment: - PGHOST: 127.0.0.1 - PGUSER: root - PSQL_PAGER: "" - - image: cimg/postgres:13.5-postgis - environment: - POSTGRES_USER: root - POSTGRES_DB: bikeindex_test - POSTGRES_PASSWORD: "" - - image: redis:7.2.3 - - # The resource_class feature allows configuring CPU and RAM resources for each job. Different resource classes are available for different executors. https://circleci.com/docs/2.0/configuration-reference/#resourceclass - resource_class: large - - steps: - - add_ssh_keys: - fingerprints: - - "b7:01:89:de:d8:f8:77:cc:9e:5a:ca:ee:0c:24:57:13" - - - checkout - - - run: - name: "Apt: install system / build dependencies" - command: | - sudo apt-get update - sudo apt-get -y install \ - curl \ - gettext \ - imagemagick \ - libcurl4-gnutls-dev \ - libexpat1-dev \ - libssl-dev \ - libz-dev \ - postgresql-client \ - ripgrep - - - run: - name: "Update Node.js and npm" - command: | - curl -sSL "https://nodejs.org/download/release/v16.20.2/node-v16.20.2-linux-x64.tar.xz" | sudo tar --strip-components=2 -xJ -C /usr/local/bin/ node-v16.20.2-linux-x64/bin/node - # curl https://www.npmjs.com/install.sh | sudo bash - - - restore_cache: - name: "Dockerize: cache restore" - keys: - - CACHE_V4-dockerize-0.6.1 - - CACHE_V4-dockerize- - - - run: - name: "Dockerize: install" - environment: - DOCKERIZE_VERSION: v0.6.1 - command: | - dockerize_tar=dockerize-linux-amd64-${DOCKERIZE_VERSION}.tar.gz - if [[ ! -f ~/.cache/dockerize/${dockerize_tar} ]]; then - wget https://github.com/jwilder/dockerize/releases/download/${DOCKERIZE_VERSION}/${dockerize_tar} - fi - sudo tar -C /usr/local/bin -xzvf ${dockerize_tar} - - - type: cache-save - name: "Dockerize: cache save" - key: CACHE_V4-dockerize-0.6.1 - paths: - - ~/.cache/dockerize - - # Updated all restore_cache to make things more functional when changing a single dependency, see PR#2366 - - restore_cache: - name: "Git: cache restore" - keys: - - CACHE_V4-git-2.22.0 - - CACHE_V4-git- - - - run: - name: "Git: install" - environment: - GIT_VERSION: 2.22.0 - command: | - set -x - - git_binary=~/.cache/git/git-${GIT_VERSION}/git - - if [[ ! -f $git_binary ]]; then - rm -rf ~/.cache/git - mkdir -p ~/.cache/git - cd ~/.cache/git - - wget -O git.tgz https://mirrors.edge.kernel.org/pub/software/scm/git/git-${GIT_VERSION}.tar.gz - tar -xzf git.tgz - cd git-${GIT_VERSION} - - export DEFAULT_HELP_FORMAT="man" - autoconf - ./configure - - sudo make man - sudo make install-man - fi - - cd ~/.cache/git/git-${GIT_VERSION} - sudo make prefix=/usr/local all - sudo make install - sudo cp ${git_binary} /usr/local/bin/git - - - type: cache-save - name: "Git: cache save" - key: CACHE_V4-git-2.22.0 - paths: - - ~/.cache/git/git-2.22.0 - - - restore_cache: - name: "Hub: cache restore" - keys: - - CACHE_V4-hub-2.12.3 - - CACHE_V4-hub- - - - run: - name: "Hub: install" - environment: - HUB_VERSION: 2.12.3 - command: | - set -x - - hub_binary=~/.cache/hub/hub-linux-amd64-${HUB_VERSION}/bin/hub - - if [[ ! -f ${hub_binary} ]]; then - rm -rf ~/.cache/hub - mkdir -p ~/.cache/hub - cd ~/.cache/hub - - wget -O hub.tgz https://github.com/github/hub/releases/download/v${HUB_VERSION}/hub-linux-amd64-${HUB_VERSION}.tgz - tar -xzf hub.tgz - fi - - sudo cp ${hub_binary} /usr/local/bin/hub - - - restore_cache: - name: "Hub: cache save" - keys: - - CACHE_V4-hub-2.12.3 - - CACHE_V4-hub- - paths: - - ~/.cache/hub - - - run: - name: "Bundler: install" - command: gem install bundler -v 2.4.22 - - - restore_cache: - name: "Ruby dependencies: cache restore" - keys: - - CACHE_V4-gems-{{ checksum "Gemfile.lock" }} - - CACHE_V4-gems- - - - run: - name: "Ruby dependencies: install" - command: | - set -x - bundle config set --local path '~/.cache/bundle' - bundle install - - - type: cache-save - name: "Ruby dependencies: cache save" - key: CACHE_V4-gems-{{ checksum "Gemfile.lock" }} - paths: - - ~/.cache/bundle - - - run: - name: Sync translations (only on main by default) - command: bin/check_translations - - - restore_cache: - name: "Node dependencies: cache restore" - keys: - - CACHE_V4-yarn-{{ checksum "yarn.lock" }} - - CACHE_V4-yarn- - - - run: - name: "Node dependencies: install" - command: | - set -x - [[ -d ~/.cache/yarn ]] && use_local="--prefer-offline" - yarn install --cache-folder ~/.cache/yarn $use_local - - - type: cache-save - name: "Node dependencies: cache save" - key: CACHE_V4-yarn-{{ checksum "yarn.lock" }} - paths: - - ~/.cache/yarn - - - restore_cache: - name: "Assets: cache restore" - keys: - - CACHE_V4-assets-{{ .Environment.CIRCLE_SHA1 }} - - CACHE_V4-assets- - - - run: - name: "Assets: precompile" - command: | - set -x - node --version - bin/webpack - bundle exec rails assets:precompile assets:clean --trace - - - type: cache-save - name: "Assets: cache save" - key: CACHE_V4-assets-{{ .Environment.CIRCLE_SHA1 }} - paths: - - .sass-cache - - public/assets - - public/packs - - public/packs-test - - tmp/cache/assets - - tmp/cache/webpacker - - - run: - name: Install Code Climate Test Reporter - command: | - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter - chmod +x ./cc-test-reporter - - - run: - name: Wait for PostgreSQL to start - command: dockerize -wait tcp://localhost:5432 -timeout 1m - - run: name: Setup Database command: | @@ -591,7 +309,7 @@ jobs: path: /tmp/test-results - store_artifacts: path: coverage - + upload-coverage: docker: - image: cimg/ruby:2.7.8-node @@ -632,7 +350,6 @@ workflows: commit: jobs: - build - - build_next - brakeman_scan - upload-coverage: requires: From 47393c6e3b6f571a29ba4910aa2d637e271c7914 Mon Sep 17 00:00:00 2001 From: "G. Torres" <gelsey@ombulabs.com> Date: Tue, 3 Sep 2024 17:31:36 -0400 Subject: [PATCH 06/12] BIB-49: Updates the Gemfile.lock to use Rails 7 --- Gemfile.lock | 120 +++++++++++++++++++++++++++------------------------ 1 file changed, 63 insertions(+), 57 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index b968847cfe..91e5e5423d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -51,67 +51,73 @@ GEM GEM remote: https://rubygems.org/ specs: - actioncable (6.1.7.8) - actionpack (= 6.1.7.8) - activesupport (= 6.1.7.8) + actioncable (7.0.8.4) + actionpack (= 7.0.8.4) + activesupport (= 7.0.8.4) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailbox (6.1.7.8) - actionpack (= 6.1.7.8) - activejob (= 6.1.7.8) - activerecord (= 6.1.7.8) - activestorage (= 6.1.7.8) - activesupport (= 6.1.7.8) + actionmailbox (7.0.8.4) + actionpack (= 7.0.8.4) + activejob (= 7.0.8.4) + activerecord (= 7.0.8.4) + activestorage (= 7.0.8.4) + activesupport (= 7.0.8.4) mail (>= 2.7.1) - actionmailer (6.1.7.8) - actionpack (= 6.1.7.8) - actionview (= 6.1.7.8) - activejob (= 6.1.7.8) - activesupport (= 6.1.7.8) + net-imap + net-pop + net-smtp + actionmailer (7.0.8.4) + actionpack (= 7.0.8.4) + actionview (= 7.0.8.4) + activejob (= 7.0.8.4) + activesupport (= 7.0.8.4) mail (~> 2.5, >= 2.5.4) + net-imap + net-pop + net-smtp rails-dom-testing (~> 2.0) - actionpack (6.1.7.8) - actionview (= 6.1.7.8) - activesupport (= 6.1.7.8) - rack (~> 2.0, >= 2.0.9) + actionpack (7.0.8.4) + actionview (= 7.0.8.4) + activesupport (= 7.0.8.4) + rack (~> 2.0, >= 2.2.4) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actiontext (6.1.7.8) - actionpack (= 6.1.7.8) - activerecord (= 6.1.7.8) - activestorage (= 6.1.7.8) - activesupport (= 6.1.7.8) + actiontext (7.0.8.4) + actionpack (= 7.0.8.4) + activerecord (= 7.0.8.4) + activestorage (= 7.0.8.4) + activesupport (= 7.0.8.4) + globalid (>= 0.6.0) nokogiri (>= 1.8.5) - actionview (6.1.7.8) - activesupport (= 6.1.7.8) + actionview (7.0.8.4) + activesupport (= 7.0.8.4) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) active_model_serializers (0.8.4) activemodel (>= 3.0) - activejob (6.1.7.8) - activesupport (= 6.1.7.8) + activejob (7.0.8.4) + activesupport (= 7.0.8.4) globalid (>= 0.3.6) - activemodel (6.1.7.8) - activesupport (= 6.1.7.8) - activerecord (6.1.7.8) - activemodel (= 6.1.7.8) - activesupport (= 6.1.7.8) - activestorage (6.1.7.8) - actionpack (= 6.1.7.8) - activejob (= 6.1.7.8) - activerecord (= 6.1.7.8) - activesupport (= 6.1.7.8) + activemodel (7.0.8.4) + activesupport (= 7.0.8.4) + activerecord (7.0.8.4) + activemodel (= 7.0.8.4) + activesupport (= 7.0.8.4) + activestorage (7.0.8.4) + actionpack (= 7.0.8.4) + activejob (= 7.0.8.4) + activerecord (= 7.0.8.4) + activesupport (= 7.0.8.4) marcel (~> 1.0) mini_mime (>= 1.1.0) - activesupport (6.1.7.8) + activesupport (7.0.8.4) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) tzinfo (~> 2.0) - zeitwerk (~> 2.3) addressable (2.8.7) public_suffix (>= 2.0.2, < 7.0) annotate (3.2.0) @@ -549,21 +555,20 @@ GEM rack-throttle (0.7.0) bundler (>= 1.0.0) rack (>= 1.0.0) - rails (6.1.7.8) - actioncable (= 6.1.7.8) - actionmailbox (= 6.1.7.8) - actionmailer (= 6.1.7.8) - actionpack (= 6.1.7.8) - actiontext (= 6.1.7.8) - actionview (= 6.1.7.8) - activejob (= 6.1.7.8) - activemodel (= 6.1.7.8) - activerecord (= 6.1.7.8) - activestorage (= 6.1.7.8) - activesupport (= 6.1.7.8) + rails (7.0.8.4) + actioncable (= 7.0.8.4) + actionmailbox (= 7.0.8.4) + actionmailer (= 7.0.8.4) + actionpack (= 7.0.8.4) + actiontext (= 7.0.8.4) + actionview (= 7.0.8.4) + activejob (= 7.0.8.4) + activemodel (= 7.0.8.4) + activerecord (= 7.0.8.4) + activestorage (= 7.0.8.4) + activesupport (= 7.0.8.4) bundler (>= 1.15.0) - railties (= 6.1.7.8) - sprockets-rails (>= 2.0.0) + railties (= 7.0.8.4) rails-controller-testing (1.0.4) actionpack (>= 5.0.1.x) actionview (>= 5.0.1.x) @@ -578,12 +583,13 @@ GEM rails-i18n (7.0.8) i18n (>= 0.7, < 2) railties (>= 6.0.0, < 8) - railties (6.1.7.8) - actionpack (= 6.1.7.8) - activesupport (= 6.1.7.8) + railties (7.0.8.4) + actionpack (= 7.0.8.4) + activesupport (= 7.0.8.4) method_source rake (>= 12.2) thor (~> 1.0) + zeitwerk (~> 2.5) rainbow (3.1.1) rake (13.2.1) rb-fsevent (0.10.4) @@ -847,7 +853,7 @@ DEPENDENCIES rack (~> 2.2.3) rack-mini-profiler rack-throttle - rails (~> 6.0) + rails (~> 7.0.8.4) rails-assets-Stickyfill (~> 1.1.3)! rails-assets-jquery (~> 3.4.1)! rails-assets-jquery.dirtyforms (~> 2.0.0)! From 408a15b7818a4f24d8430d1c2c8b3d599803fbd4 Mon Sep 17 00:00:00 2001 From: "G. Torres" <gelsey@ombulabs.com> Date: Wed, 4 Sep 2024 15:08:39 -0400 Subject: [PATCH 07/12] Updates the db:structure:load command since it's removed in Rails 7 --- bin/setup | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/setup b/bin/setup index 9e87e072f8..d910ccf9eb 100755 --- a/bin/setup +++ b/bin/setup @@ -23,8 +23,8 @@ chdir APP_ROOT do system('bin/yarn') puts "\n== Preparing and seeding database ==" - # NOTE: only loading db:structure on primary, because primary_replica is the same db in dev - system "bin/rake db:create db:structure:load:primary db:migrate db:seed" + # NOTE: only loading db:schema on primary, because primary_replica is the same db in dev + system "bin/rake db:create db:schema:load:primary db:migrate db:seed" system "bin/rake seed_test_users_and_bikes" puts "\n== Preparing test database (including parallelism) ==" From 073824b7b251d29367c144aa9516475c798c56aa Mon Sep 17 00:00:00 2001 From: "G. Torres" <gelsey@ombulabs.com> Date: Thu, 5 Sep 2024 15:33:56 -0400 Subject: [PATCH 08/12] BIB-49: Removes accidental spacing I added --- .circleci/config.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index db48114623..08d351a1de 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -309,7 +309,6 @@ jobs: path: /tmp/test-results - store_artifacts: path: coverage - upload-coverage: docker: - image: cimg/ruby:2.7.8-node From 764b5ff62eafed8755573208e4470fad777e8a0f Mon Sep 17 00:00:00 2001 From: "G. Torres" <gelsey@ombulabs.com> Date: Thu, 26 Sep 2024 17:46:52 -0400 Subject: [PATCH 09/12] BIB-49: Removes reference to build_next job that was deleted --- .circleci/config.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 0358d70e75..e70bdab195 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -350,7 +350,6 @@ workflows: commit: jobs: - build - - build_next - brakeman_scan - upload-coverage: requires: From e1457abb4c7d801e864bb59a320cce37344b73ea Mon Sep 17 00:00:00 2001 From: "G. Torres" <gelsey@ombulabs.com> Date: Mon, 14 Oct 2024 12:52:50 -0400 Subject: [PATCH 10/12] BIB-67: ActionView::Template::Error: undefined method `valid_encoding?' (#2590) --- config/initializers/kramdown.rb | 37 +++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 config/initializers/kramdown.rb diff --git a/config/initializers/kramdown.rb b/config/initializers/kramdown.rb new file mode 100644 index 0000000000..fb67351459 --- /dev/null +++ b/config/initializers/kramdown.rb @@ -0,0 +1,37 @@ +module Kramdown + + module Parser + class Base + def adapt_source(source) + # We added this monkeypatch because we had 2 tests in spec/requests/documentation_request_spec.rb + # failing in Rails 7.1 with the following error: + # ActionView::Template::Error:undefined method `valid_encoding?' + # for #<ActionView::OutputBuffer:0x000056417815bbb0> + # + # We believe we need to upgrade grape-swagger, but this would require us to upgrade grape, which + # requires us to upgrade to Ruby 3.0. + # We will keep this monkey patch until we can finish the Ruby 3.0 upgrade and the tests pass + # without this patch. + # + # See these links for more information: + # https://github.com/gettalong/kramdown/blob/0b0a9e072f9a76e59fe2bbafdf343118fb27c3fa/lib/kramdown/parser/base.rb#L91-L92 + # https://github.com/rails/rails/pull/51023 + # https://github.com/gettalong/kramdown/pull/807 + + + + if source.respond_to?(:to_s) + source = source.to_s + end + + unless source.valid_encoding? + raise "The source text contains invalid characters for the used encoding #{source.encoding}" + end + source = source.encode('UTF-8') + source.gsub!(/\r\n?/, "\n") + source.chomp! + source << "\n" + end + end + end +end \ No newline at end of file From d7d59cde4d3490018bdbc630f1742a71197d6b9b Mon Sep 17 00:00:00 2001 From: "G. Torres" <gelsey@ombulabs.com> Date: Mon, 14 Oct 2024 12:53:02 -0400 Subject: [PATCH 11/12] BIB-66: Fix 'ActionView::Template::Error: include_blank cannot be false for a required field.' (#2589) --- .../organized/model_audits/_submit_model_attestation.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/organized/model_audits/_submit_model_attestation.html.haml b/app/views/organized/model_audits/_submit_model_attestation.html.haml index e9cd89aacd..9762278ddb 100644 --- a/app/views/organized/model_audits/_submit_model_attestation.html.haml +++ b/app/views/organized/model_audits/_submit_model_attestation.html.haml @@ -8,7 +8,7 @@ %strong#updateModalMnfg Manufacturer %em#updateModalFrameModel Model - opts = [["Mark Certified", "certified_by_trusted_org"], ["Mark NOT certified", "uncertified_by_trusted_org"], ["Record other update", "certification_update"]] - = f.select(:kind, opts, {include_blank: false, required: true}, {class: 'form-control'}) + = f.select(:kind, opts, {include_blank: true, required: true}, {class: 'form-control'}) .form-group.collapse.in.hidden-not-certification-updating = f.label :certification_type = f.text_field :certification_type, placeholder: "optional", required: false, class: "form-control" From d4e0a09582004e3f0a0c84fcc120f7276574133b Mon Sep 17 00:00:00 2001 From: Seth Herr <seth.william.herr@gmail.com> Date: Mon, 14 Oct 2024 10:31:28 -0700 Subject: [PATCH 12/12] bump honeybadger --- Gemfile.lock | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 54061fb632..f3e7f7dc27 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -329,7 +329,8 @@ GEM hashdiff (1.0.0) hashie (5.0.0) highline (2.1.0) - honeybadger (4.5.4) + honeybadger (5.16.0) + logger htmlentities (4.3.4) http (4.4.1) addressable (~> 2.3)