From 00a973cedabd208b08c053582c1c39b53e21b23a Mon Sep 17 00:00:00 2001 From: John Jeffers Date: Tue, 23 Apr 2024 10:55:13 -0600 Subject: [PATCH 01/10] roll back to ruby 2.7.5 --- .ruby-version | 2 +- Gemfile | 2 +- Gemfile.lock | 6 +++--- Rakefile | 1 + 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.ruby-version b/.ruby-version index 15a2799..460b6fd 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -3.3.0 +2.7.5 \ No newline at end of file diff --git a/Gemfile b/Gemfile index 8801a96..c4c0652 100644 --- a/Gemfile +++ b/Gemfile @@ -13,7 +13,7 @@ # language governing permissions and limitations under the License. source 'https://rubygems.org' -ruby '3.3.0' +ruby '2.7.5' gem 'rake', '~> 13.2', '>= 13.2.1' gem 'minitest', '~> 5.22', '>= 5.22.3' diff --git a/Gemfile.lock b/Gemfile.lock index a5b415b..76f66a2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -10,7 +10,7 @@ GEM erb (2.2.3) cgi extralite-bundle (1.27) - mini_portile2 (2.8.5) + mini_portile2 (2.8.6) minitest (5.22.3) nokogiri (1.15.6) mini_portile2 (~> 2.8.2) @@ -45,7 +45,7 @@ DEPENDENCIES rdoc-markdown (~> 0.4.2) RUBY VERSION - ruby 3.3.0p0 + ruby 2.7.5p203 BUNDLED WITH - 2.5.7 + 2.7.5 diff --git a/Rakefile b/Rakefile index 8a56158..11ff1b4 100644 --- a/Rakefile +++ b/Rakefile @@ -1,3 +1,4 @@ +require 'bundler/gem_tasks' require 'minitest/test_task' Minitest::TestTask.create From 565b0b9abc2a077a733700bd0c4d656fa91eec9a Mon Sep 17 00:00:00 2001 From: John Jeffers Date: Tue, 23 Apr 2024 13:23:02 -0600 Subject: [PATCH 02/10] gemfile updates --- Gemfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index c4c0652..93dda29 100644 --- a/Gemfile +++ b/Gemfile @@ -15,10 +15,10 @@ source 'https://rubygems.org' ruby '2.7.5' -gem 'rake', '~> 13.2', '>= 13.2.1' -gem 'minitest', '~> 5.22', '>= 5.22.3' +gem 'minitest', '~> 5.22', '>= 5.22.3' +gem 'rake', '~> 13.2', '>= 13.2.1' +gem 'rdoc-markdown', '~> 0.4.2' +gem 'nokogiri', '1.15.6' # Specify your gem's dependencies in fusionauth_client.gemspec gemspec - -gem 'rdoc-markdown', '~> 0.4.2' From c097a1ac32f0a42e0913c7467bb1151e45d3c5b0 Mon Sep 17 00:00:00 2001 From: John Jeffers Date: Tue, 23 Apr 2024 13:31:59 -0600 Subject: [PATCH 03/10] gemfile.lock version --- Gemfile | 4 ++-- Gemfile.lock | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 93dda29..914cba3 100644 --- a/Gemfile +++ b/Gemfile @@ -17,8 +17,8 @@ ruby '2.7.5' gem 'minitest', '~> 5.22', '>= 5.22.3' gem 'rake', '~> 13.2', '>= 13.2.1' -gem 'rdoc-markdown', '~> 0.4.2' -gem 'nokogiri', '1.15.6' # Specify your gem's dependencies in fusionauth_client.gemspec gemspec + +gem 'rdoc-markdown', '~> 0.4.2' diff --git a/Gemfile.lock b/Gemfile.lock index 76f66a2..f5563fd 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -48,4 +48,4 @@ RUBY VERSION ruby 2.7.5p203 BUNDLED WITH - 2.7.5 + 2.2.5 From 97ccf832b9993311dd8cb7334d190ceff4f47395 Mon Sep 17 00:00:00 2001 From: John Jeffers Date: Tue, 23 Apr 2024 14:28:39 -0600 Subject: [PATCH 04/10] bump setup-ruby in workflow --- .github/workflows/docs.yml | 2 +- .github/workflows/test.yml | 2 +- Gemfile.lock | 14 ++++++-------- 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 967ec0a..d3420ef 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -14,7 +14,7 @@ jobs: - uses: actions/checkout@v4 - name: Set up Ruby - uses: ruby/setup-ruby@v1 + uses: ruby/setup-ruby@v3 with: bundler-cache: true diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 7bd99ea..186794e 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -20,7 +20,7 @@ jobs: run: docker compose up -d - name: Set up Ruby - uses: ruby/setup-ruby@v1 + uses: ruby/setup-ruby@v3 with: bundler-cache: true diff --git a/Gemfile.lock b/Gemfile.lock index f5563fd..9386d88 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -10,10 +10,10 @@ GEM erb (2.2.3) cgi extralite-bundle (1.27) - mini_portile2 (2.8.6) minitest (5.22.3) - nokogiri (1.15.6) - mini_portile2 (~> 2.8.2) + nokogiri (1.15.6-aarch64-linux) + racc (~> 1.4) + nokogiri (1.15.6-arm64-darwin) racc (~> 1.4) psych (5.1.2) stringio @@ -33,10 +33,8 @@ GEM unindent (1.0) PLATFORMS - ruby - x86_64-darwin-19 - x86_64-darwin-20 - x86_64-linux + aarch64-linux + arm64-darwin-23 DEPENDENCIES fusionauth_client! @@ -48,4 +46,4 @@ RUBY VERSION ruby 2.7.5p203 BUNDLED WITH - 2.2.5 + 2.4.22 From ce951382cbc48eefc1fbfa56e56f952bb120aa8e Mon Sep 17 00:00:00 2001 From: John Jeffers Date: Tue, 23 Apr 2024 14:29:36 -0600 Subject: [PATCH 05/10] rollback action version --- .github/workflows/docs.yml | 2 +- .github/workflows/test.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index d3420ef..967ec0a 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -14,7 +14,7 @@ jobs: - uses: actions/checkout@v4 - name: Set up Ruby - uses: ruby/setup-ruby@v3 + uses: ruby/setup-ruby@v1 with: bundler-cache: true diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 186794e..7bd99ea 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -20,7 +20,7 @@ jobs: run: docker compose up -d - name: Set up Ruby - uses: ruby/setup-ruby@v3 + uses: ruby/setup-ruby@v1 with: bundler-cache: true From 7cae9453d06f056b5b7344774e4d6f21524b26a8 Mon Sep 17 00:00:00 2001 From: John Jeffers Date: Tue, 23 Apr 2024 14:31:07 -0600 Subject: [PATCH 06/10] add x64 to platforms --- Gemfile.lock | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Gemfile.lock b/Gemfile.lock index 9386d88..31e7377 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -15,6 +15,8 @@ GEM racc (~> 1.4) nokogiri (1.15.6-arm64-darwin) racc (~> 1.4) + nokogiri (1.15.6-x86_64-linux) + racc (~> 1.4) psych (5.1.2) stringio racc (1.7.3) @@ -35,6 +37,7 @@ GEM PLATFORMS aarch64-linux arm64-darwin-23 + x86_64-linux DEPENDENCIES fusionauth_client! From 778040c8515442c7f0a148854b9b2e0e79f265e8 Mon Sep 17 00:00:00 2001 From: John Jeffers Date: Tue, 23 Apr 2024 15:23:04 -0600 Subject: [PATCH 07/10] debug --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 7bd99ea..fae94b8 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -28,4 +28,4 @@ jobs: run: timeout 30 bash -c 'while [[ "$(curl -s -o /dev/null -w ''%{http_code}'' localhost:9011)" != "200" ]]; do sleep 5; done' || false - name: Run test suite - run: rake test + run: set -xv && rake test From 8e7774cd74055ae4edc4a6633c0814ee30ff8aeb Mon Sep 17 00:00:00 2001 From: John Jeffers Date: Tue, 23 Apr 2024 15:26:05 -0600 Subject: [PATCH 08/10] bundle install --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index fae94b8..70cd33b 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -28,4 +28,4 @@ jobs: run: timeout 30 bash -c 'while [[ "$(curl -s -o /dev/null -w ''%{http_code}'' localhost:9011)" != "200" ]]; do sleep 5; done' || false - name: Run test suite - run: set -xv && rake test + run: bundle install && rake test From 53b61df1fe44884fee0ad11448458d5910a079f3 Mon Sep 17 00:00:00 2001 From: John Jeffers Date: Tue, 23 Apr 2024 15:29:48 -0600 Subject: [PATCH 09/10] roll back rakefile --- .github/workflows/test.yml | 2 +- Rakefile | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 70cd33b..7bd99ea 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -28,4 +28,4 @@ jobs: run: timeout 30 bash -c 'while [[ "$(curl -s -o /dev/null -w ''%{http_code}'' localhost:9011)" != "200" ]]; do sleep 5; done' || false - name: Run test suite - run: bundle install && rake test + run: rake test diff --git a/Rakefile b/Rakefile index 11ff1b4..b84e97f 100644 --- a/Rakefile +++ b/Rakefile @@ -1,6 +1,10 @@ -require 'bundler/gem_tasks' -require 'minitest/test_task' +require "bundler/gem_tasks" +require "rake/testtask" -Minitest::TestTask.create +Rake::TestTask.new(:test) do |t| + t.libs << "test" + t.libs << "lib" + t.test_files = FileList['test/**/*test.rb'] +end task :default => :test From cacdca0f4012d63af5760109f96f56fd9b1f160a Mon Sep 17 00:00:00 2001 From: John Jeffers Date: Tue, 23 Apr 2024 15:33:14 -0600 Subject: [PATCH 10/10] gemfile tweak --- Gemfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Gemfile b/Gemfile index 914cba3..914d5fe 100644 --- a/Gemfile +++ b/Gemfile @@ -17,8 +17,7 @@ ruby '2.7.5' gem 'minitest', '~> 5.22', '>= 5.22.3' gem 'rake', '~> 13.2', '>= 13.2.1' +gem 'rdoc-markdown', '~> 0.4.2' # Specify your gem's dependencies in fusionauth_client.gemspec gemspec - -gem 'rdoc-markdown', '~> 0.4.2'