From a642f71b7b0136cca1aa564c8d47d2a6675b1a01 Mon Sep 17 00:00:00 2001 From: Kingdon Barrett Date: Tue, 12 Dec 2023 15:49:22 -0500 Subject: [PATCH 1/5] Bug Scrub 0088 Signed-off-by: Kingdon Barrett --- params.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/params.rb b/params.rb index e52908d..fa513f7 100644 --- a/params.rb +++ b/params.rb @@ -1,7 +1,7 @@ module Params - @@google_sheet_id = "1xgt9Mqt-ktSGq1BY01nHbdDXz7a0BW1WxjBU3gmZMEQ" - @@scrub_event_id = "0087" - @@previous_event_id = "0086" + @@google_sheet_id = "15eOvdnFwQ24HgWmQrlZm-wcdQPGZPIDZ6bWlLxxyxWA" + @@scrub_event_id = "0088" + @@previous_event_id = "0087" def google_sheet_id @@google_sheet_id From d10a3aceee979c53a49c7b1d3a85276edd4af7fa Mon Sep 17 00:00:00 2001 From: Kingdon Barrett Date: Thu, 21 Dec 2023 12:19:10 -0500 Subject: [PATCH 2/5] Bug Scrub 0089 Signed-off-by: Kingdon Barrett --- params.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/params.rb b/params.rb index fa513f7..5f7bb2f 100644 --- a/params.rb +++ b/params.rb @@ -1,7 +1,7 @@ module Params - @@google_sheet_id = "15eOvdnFwQ24HgWmQrlZm-wcdQPGZPIDZ6bWlLxxyxWA" - @@scrub_event_id = "0088" - @@previous_event_id = "0087" + @@google_sheet_id = "1B19waUhimvYNzn38ZIJxOKT6w2syq0TZs0UAM4Q-5t8" + @@scrub_event_id = "0089" + @@previous_event_id = "0088" def google_sheet_id @@google_sheet_id From 37c150e3b2a6f525c5e53e67ac0b9921f20ed021 Mon Sep 17 00:00:00 2001 From: Kingdon B Date: Tue, 26 Dec 2023 14:30:58 -0500 Subject: [PATCH 3/5] ruby 3.3.0 & bundle update --- .ruby-version | 2 +- Gemfile | 3 +- Gemfile.lock | 207 +++++++++++++++++++++++++------------------------- README.md | 30 ++++++++ 4 files changed, 138 insertions(+), 104 deletions(-) diff --git a/.ruby-version b/.ruby-version index 1e5472d..ad26a1d 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -3.0.6@bugscrub +3.3.0@bugscrub diff --git a/Gemfile b/Gemfile index 12328f4..8dd127c 100644 --- a/Gemfile +++ b/Gemfile @@ -1,11 +1,12 @@ source 'https://rubygems.org' -ruby '3.0.6' +ruby '3.3.0' gem "export-pull-requests", "~> 0.4.0" gem "google_drive" gem "rails", "~> 6.1" gem 'graphql-client' +gem 'openssl' group :development, :test do gem "pry-rails" diff --git a/Gemfile.lock b/Gemfile.lock index c04be50..7314030 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,72 +1,72 @@ GEM remote: https://rubygems.org/ specs: - actioncable (6.1.7.3) - actionpack (= 6.1.7.3) - activesupport (= 6.1.7.3) + actioncable (6.1.7.6) + actionpack (= 6.1.7.6) + activesupport (= 6.1.7.6) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailbox (6.1.7.3) - actionpack (= 6.1.7.3) - activejob (= 6.1.7.3) - activerecord (= 6.1.7.3) - activestorage (= 6.1.7.3) - activesupport (= 6.1.7.3) + actionmailbox (6.1.7.6) + actionpack (= 6.1.7.6) + activejob (= 6.1.7.6) + activerecord (= 6.1.7.6) + activestorage (= 6.1.7.6) + activesupport (= 6.1.7.6) mail (>= 2.7.1) - actionmailer (6.1.7.3) - actionpack (= 6.1.7.3) - actionview (= 6.1.7.3) - activejob (= 6.1.7.3) - activesupport (= 6.1.7.3) + actionmailer (6.1.7.6) + actionpack (= 6.1.7.6) + actionview (= 6.1.7.6) + activejob (= 6.1.7.6) + activesupport (= 6.1.7.6) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (6.1.7.3) - actionview (= 6.1.7.3) - activesupport (= 6.1.7.3) + actionpack (6.1.7.6) + actionview (= 6.1.7.6) + activesupport (= 6.1.7.6) rack (~> 2.0, >= 2.0.9) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actiontext (6.1.7.3) - actionpack (= 6.1.7.3) - activerecord (= 6.1.7.3) - activestorage (= 6.1.7.3) - activesupport (= 6.1.7.3) + actiontext (6.1.7.6) + actionpack (= 6.1.7.6) + activerecord (= 6.1.7.6) + activestorage (= 6.1.7.6) + activesupport (= 6.1.7.6) nokogiri (>= 1.8.5) - actionview (6.1.7.3) - activesupport (= 6.1.7.3) + actionview (6.1.7.6) + activesupport (= 6.1.7.6) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - activejob (6.1.7.3) - activesupport (= 6.1.7.3) + activejob (6.1.7.6) + activesupport (= 6.1.7.6) globalid (>= 0.3.6) - activemodel (6.1.7.3) - activesupport (= 6.1.7.3) - activerecord (6.1.7.3) - activemodel (= 6.1.7.3) - activesupport (= 6.1.7.3) - activestorage (6.1.7.3) - actionpack (= 6.1.7.3) - activejob (= 6.1.7.3) - activerecord (= 6.1.7.3) - activesupport (= 6.1.7.3) + activemodel (6.1.7.6) + activesupport (= 6.1.7.6) + activerecord (6.1.7.6) + activemodel (= 6.1.7.6) + activesupport (= 6.1.7.6) + activestorage (6.1.7.6) + actionpack (= 6.1.7.6) + activejob (= 6.1.7.6) + activerecord (= 6.1.7.6) + activesupport (= 6.1.7.6) marcel (~> 1.0) mini_mime (>= 1.1.0) - activesupport (6.1.7.3) + activesupport (6.1.7.6) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) tzinfo (~> 2.0) zeitwerk (~> 2.3) - addressable (2.8.4) + addressable (2.8.6) public_suffix (>= 2.0.2, < 6.0) builder (3.2.4) coderay (1.1.3) concurrent-ruby (1.2.2) crass (1.0.6) - date (3.3.3) + date (3.3.4) declarative (0.0.20) descendants_tracker (0.0.4) thread_safe (~> 0.3, >= 0.3.1) @@ -108,9 +108,9 @@ GEM gitlab (4.19.0) httparty (~> 0.20) terminal-table (>= 1.5.1) - globalid (1.1.0) - activesupport (>= 5.0) - google-apis-core (0.11.0) + globalid (1.2.1) + activesupport (>= 6.1) + google-apis-core (0.11.2) addressable (~> 2.5, >= 2.5.1) googleauth (>= 0.16.2, < 2.a) httpclient (>= 2.8.1, < 3.a) @@ -119,9 +119,9 @@ GEM retriable (>= 2.0, < 4.a) rexml webrick - google-apis-drive_v3 (0.37.0) + google-apis-drive_v3 (0.46.0) google-apis-core (>= 0.11.0, < 2.a) - google-apis-sheets_v4 (0.22.0) + google-apis-sheets_v4 (0.26.0) google-apis-core (>= 0.11.0, < 2.a) google_drive (3.0.7) google-apis-drive_v3 (>= 0.5.0, < 1.0.0) @@ -135,7 +135,8 @@ GEM multi_json (~> 1.11) os (>= 0.9, < 2.0) signet (~> 0.15) - graphql (2.0.21) + graphql (2.2.1) + racc (~> 1.4) graphql-client (0.18.0) activesupport (>= 3.0) graphql @@ -144,12 +145,12 @@ GEM mini_mime (>= 1.0.0) multi_xml (>= 0.5.2) httpclient (2.8.3) - i18n (1.12.0) + i18n (1.14.1) concurrent-ruby (~> 1.0) - jwt (2.7.0) - loofah (2.20.0) + jwt (2.7.1) + loofah (2.22.0) crass (~> 1.0.2) - nokogiri (>= 1.5.9) + nokogiri (>= 1.12.0) mail (2.8.1) mini_mime (>= 0.1.1) net-imap @@ -158,26 +159,24 @@ GEM marcel (1.0.2) memoist (0.16.2) method_source (1.0.0) - mini_mime (1.1.2) - mini_portile2 (2.8.1) - minitest (5.18.0) + mini_mime (1.1.5) + mini_portile2 (2.8.5) + minitest (5.20.0) multi_json (1.15.0) multi_xml (0.6.0) multipart-post (2.3.0) - net-imap (0.3.4) + net-imap (0.4.9) date net-protocol net-pop (0.1.2) net-protocol - net-protocol (0.2.1) + net-protocol (0.2.2) timeout - net-smtp (0.3.3) + net-smtp (0.4.0) net-protocol - nio4r (2.5.9) - nokogiri (1.14.3) - mini_portile2 (~> 2.8.0) - racc (~> 1.4) - nokogiri (1.14.3-arm64-darwin) + nio4r (2.7.0) + nokogiri (1.15.5) + mini_portile2 (~> 2.8.2) racc (~> 1.4) oauth2 (1.4.11) faraday (>= 0.17.3, < 3.0) @@ -185,74 +184,77 @@ GEM multi_json (~> 1.3) multi_xml (~> 0.5) rack (>= 1.2, < 4) + openssl (3.2.0) os (1.1.4) pry (0.14.2) coderay (~> 1.1) method_source (~> 1.0) pry-rails (0.3.9) pry (>= 0.10.4) - public_suffix (5.0.1) - racc (1.6.2) - rack (2.2.6.4) + public_suffix (5.0.4) + racc (1.7.3) + rack (2.2.8) rack-test (2.1.0) rack (>= 1.3) - rails (6.1.7.3) - actioncable (= 6.1.7.3) - actionmailbox (= 6.1.7.3) - actionmailer (= 6.1.7.3) - actionpack (= 6.1.7.3) - actiontext (= 6.1.7.3) - actionview (= 6.1.7.3) - activejob (= 6.1.7.3) - activemodel (= 6.1.7.3) - activerecord (= 6.1.7.3) - activestorage (= 6.1.7.3) - activesupport (= 6.1.7.3) + rails (6.1.7.6) + actioncable (= 6.1.7.6) + actionmailbox (= 6.1.7.6) + actionmailer (= 6.1.7.6) + actionpack (= 6.1.7.6) + actiontext (= 6.1.7.6) + actionview (= 6.1.7.6) + activejob (= 6.1.7.6) + activemodel (= 6.1.7.6) + activerecord (= 6.1.7.6) + activestorage (= 6.1.7.6) + activesupport (= 6.1.7.6) bundler (>= 1.15.0) - railties (= 6.1.7.3) + railties (= 6.1.7.6) sprockets-rails (>= 2.0.0) - rails-dom-testing (2.0.3) - activesupport (>= 4.2.0) + rails-dom-testing (2.2.0) + activesupport (>= 5.0.0) + minitest nokogiri (>= 1.6) - rails-html-sanitizer (1.5.0) - loofah (~> 2.19, >= 2.19.1) - railties (6.1.7.3) - actionpack (= 6.1.7.3) - activesupport (= 6.1.7.3) + rails-html-sanitizer (1.6.0) + loofah (~> 2.21) + nokogiri (~> 1.14) + railties (6.1.7.6) + actionpack (= 6.1.7.6) + activesupport (= 6.1.7.6) method_source rake (>= 12.2) thor (~> 1.0) - rake (13.0.6) + rake (13.1.0) representable (3.2.0) declarative (< 0.1.0) trailblazer-option (>= 0.1.1, < 0.2.0) uber (< 0.2.0) retriable (3.1.2) - rexml (3.2.5) - rspec-core (3.12.1) + rexml (3.2.6) + rspec-core (3.12.2) rspec-support (~> 3.12.0) - rspec-expectations (3.12.2) + rspec-expectations (3.12.3) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.12.0) - rspec-mocks (3.12.5) + rspec-mocks (3.12.6) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.12.0) - rspec-rails (6.0.1) + rspec-rails (6.0.4) actionpack (>= 6.1) activesupport (>= 6.1) railties (>= 6.1) - rspec-core (~> 3.11) - rspec-expectations (~> 3.11) - rspec-mocks (~> 3.11) - rspec-support (~> 3.11) - rspec-support (3.12.0) + rspec-core (~> 3.12) + rspec-expectations (~> 3.12) + rspec-mocks (~> 3.12) + rspec-support (~> 3.12) + rspec-support (3.12.1) ruby2_keywords (0.0.5) - signet (0.17.0) + signet (0.18.0) addressable (~> 2.8) faraday (>= 0.17.5, < 3.a) jwt (>= 1.5, < 3.0) multi_json (~> 1.10) - sprockets (4.2.0) + sprockets (4.2.1) concurrent-ruby (~> 1.0) rack (>= 2.2.4, < 4) sprockets-rails (3.4.2) @@ -261,19 +263,19 @@ GEM sprockets (>= 3.0.0) terminal-table (3.0.2) unicode-display_width (>= 1.1.1, < 3) - thor (1.2.1) + thor (1.3.0) thread_safe (0.3.6) - timeout (0.3.2) + timeout (0.4.1) trailblazer-option (0.1.2) tzinfo (2.0.6) concurrent-ruby (~> 1.0) uber (0.1.0) - unicode-display_width (2.4.2) + unicode-display_width (2.5.0) webrick (1.8.1) - websocket-driver (0.7.5) + websocket-driver (0.7.6) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) - zeitwerk (2.6.7) + zeitwerk (2.6.12) PLATFORMS arm64-darwin-21 @@ -283,12 +285,13 @@ DEPENDENCIES export-pull-requests (~> 0.4.0) google_drive graphql-client + openssl pry-rails rails (~> 6.1) rspec-rails (~> 6.0.0) RUBY VERSION - ruby 3.0.6p216 + ruby 3.3.0p0 BUNDLED WITH 2.4.10 diff --git a/README.md b/README.md index ecdd7b1..a5b7666 100644 --- a/README.md +++ b/README.md @@ -3,6 +3,36 @@ For details about the Bug Scrub prep and how to run `make` (what to do before/around/after that) visit [BUGSCRUB.md](/BUGSCRUB.md) +### Prerequisites + +You need Ruby. I recommend RVM: + +```bash +gpg2 --keyserver keyserver.ubuntu.com --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB +\curl -sSL https://get.rvm.io | bash -s stable + +# (make sure that rvm is a function, log out your shell and log back in...) + +rvm install 3.3.0 --with-openssl-dir=$(brew --prefix openssl@3) +rvm gemset create bugscrub +rvm gemset create testing +rvm 3.3.0@bugscrub do bundle install +rvm 3.3.0@testing do bundle install +rvm use 3.3.0@bugscrub + +... + +source .env.local +export GITHUB_TOKEN +make reset; make clean; make +``` + +You should ensure that `bundle install` is functioning and the dependencies are all downloaded. You may need to enable openssl. + +```bash +... +``` + ### `make pr.csv` `pr.csv` is the default make target, run `make` From c0bdc2234a3ca3b4265e4bd5a686de6410f595b4 Mon Sep 17 00:00:00 2001 From: Kingdon B Date: Tue, 26 Dec 2023 19:09:28 -0500 Subject: [PATCH 4/5] update base image --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index c706c83..6a0b36c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,8 +1,8 @@ # syntax = docker.io/docker/dockerfile:experimental -FROM kingdonb/rvm-supported:dce61281 as builder-base +FROM kingdonb/rvm-supported:7783e7b8 as builder-base LABEL maintainer="Kingdon Barrett " ENV APPDIR="/home/${RVM_USER}/app" -ENV RUBY=3.0.6 +ENV RUBY=3.3.0 ENV GEMSET=testing USER root From ca040d6d9a024f92ea5afa0bfd3c16a4d6eabc43 Mon Sep 17 00:00:00 2001 From: Kingdon B Date: Tue, 26 Dec 2023 19:55:07 -0500 Subject: [PATCH 5/5] update base image --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 6a0b36c..942b596 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # syntax = docker.io/docker/dockerfile:experimental -FROM kingdonb/rvm-supported:7783e7b8 as builder-base +FROM kingdonb/rvm-supported:d6462629 as builder-base LABEL maintainer="Kingdon Barrett " ENV APPDIR="/home/${RVM_USER}/app" ENV RUBY=3.3.0