From 94c790166bb8e3941b7739865ce3232fb9c9db75 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 21 Aug 2024 14:24:01 +0000 Subject: [PATCH 1/7] Update paambaati/codeclimate-action action to v9 --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 07c7f6fc..7bf838a7 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -32,4 +32,4 @@ jobs: - name: Report code coverage if: ${{ github.ref == 'refs/heads/master' && matrix.ruby-version == '3.1' && matrix.rails-version == '7.0' }} continue-on-error: true - uses: paambaati/codeclimate-action@v8 + uses: paambaati/codeclimate-action@v9 From 944e3181dfa6c1dabf30d78eb5c315c23b4b5d04 Mon Sep 17 00:00:00 2001 From: Jason Frey Date: Thu, 29 Aug 2024 11:01:01 -0400 Subject: [PATCH 2/7] Bump rexml to 3.3.6 for CVE-2024-43398 --- manageiq-gems-pending.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manageiq-gems-pending.gemspec b/manageiq-gems-pending.gemspec index 2abe58b5..556578c4 100644 --- a/manageiq-gems-pending.gemspec +++ b/manageiq-gems-pending.gemspec @@ -28,7 +28,7 @@ Gem::Specification.new do |s| s.add_runtime_dependency "more_core_extensions", "~> 4.4" s.add_runtime_dependency "net-ftp", "~> 0.1.2" s.add_runtime_dependency "nokogiri", "~> 1.14", ">= 1.14.3" - s.add_runtime_dependency "rexml", ">= 3.3.4" + s.add_runtime_dependency "rexml", ">= 3.3.6" s.add_runtime_dependency "sys-proctable", "~> 1.2.5" s.add_runtime_dependency "sys-uname", "~> 1.2.1" s.add_runtime_dependency "win32ole", "~> 1.8.8" # this gem was extracted in ruby 3 - required if we use wmi on windows From 44f52d933f6cb5b55b3566fdaa7fa07c249a1d3b Mon Sep 17 00:00:00 2001 From: Jason Frey Date: Thu, 29 Aug 2024 11:13:20 -0400 Subject: [PATCH 3/7] Drop Rails 6.1 testing and add Rails 7.1 and 7.2 testing --- .github/workflows/ci.yaml | 3 ++- Gemfile | 6 ++++-- manageiq-gems-pending.gemspec | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 7bf838a7..091b8007 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -15,8 +15,9 @@ jobs: - '3.0' - '3.1' rails-version: - - '6.1' - '7.0' + - '7.1' + - '7.2' env: CC_TEST_REPORTER_ID: "${{ secrets.CC_TEST_REPORTER_ID }}" steps: diff --git a/Gemfile b/Gemfile index c4e0fac8..ca56b2ec 100644 --- a/Gemfile +++ b/Gemfile @@ -10,8 +10,10 @@ minimum_version = case ENV['TEST_RAILS_VERSION'] when "7.0" "~>7.0.8" - else - "~>6.1.4" + when "7.1" + "~>7.1.4" + when "7.2" + "~>7.2.1" end gem "activesupport", minimum_version diff --git a/manageiq-gems-pending.gemspec b/manageiq-gems-pending.gemspec index 2abe58b5..0952ce72 100644 --- a/manageiq-gems-pending.gemspec +++ b/manageiq-gems-pending.gemspec @@ -37,7 +37,7 @@ Gem::Specification.new do |s| s.add_development_dependency "ftpd", "~> 2.1.0" s.add_development_dependency "manageiq-style" s.add_development_dependency "rake", ">= 12.3.3" - s.add_development_dependency "rspec", "~> 3.5.0" + s.add_development_dependency "rspec", "~> 3.13" s.add_development_dependency "simplecov", ">= 0.21.2" s.add_development_dependency "timecop", "~> 0.9.1" s.add_development_dependency "xml-simple", "~> 1.1.0" From 89bc169af8161c1fd825d7d30a26ffb36d5bf89f Mon Sep 17 00:00:00 2001 From: Jason Frey Date: Tue, 3 Sep 2024 17:05:33 -0400 Subject: [PATCH 4/7] Bump more_core_extensions to 4.5 minimum --- manageiq-gems-pending.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manageiq-gems-pending.gemspec b/manageiq-gems-pending.gemspec index 2072ef04..8b7baa3a 100644 --- a/manageiq-gems-pending.gemspec +++ b/manageiq-gems-pending.gemspec @@ -25,7 +25,7 @@ Gem::Specification.new do |s| s.add_runtime_dependency "aws-sdk-s3", "~> 1.0" s.add_runtime_dependency "bundler", "~> 2.1", ">= 2.1.4", "!= 2.2.10" s.add_runtime_dependency "fog-openstack", "~> 1.0" - s.add_runtime_dependency "more_core_extensions", "~> 4.4" + s.add_runtime_dependency "more_core_extensions", "~> 4.5" s.add_runtime_dependency "net-ftp", "~> 0.1.2" s.add_runtime_dependency "nokogiri", "~> 1.14", ">= 1.14.3" s.add_runtime_dependency "rexml", ">= 3.3.6" From 75bef5eb54c17d01d8519090d1121e210e3976e9 Mon Sep 17 00:00:00 2001 From: Joe Rafaniello Date: Tue, 24 Sep 2024 14:09:08 -0400 Subject: [PATCH 5/7] TEST_RAILS_VERSION wasn't set in ENV so matrix was broken Rails 7.2 will not install in versions of ruby less than 3.1. Because we weren't setting the ENV variable properly, the test matrix was not correctly testing against the correct rails version and passing. --- .github/workflows/ci.yaml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 091b8007..a909d16c 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -12,13 +12,18 @@ jobs: strategy: matrix: ruby-version: - - '3.0' - '3.1' rails-version: - '7.0' - '7.1' - '7.2' + include: + - ruby-version: '3.0' + rails-version: '7.0' + - ruby-version: '3.0' + rails-version: '7.1' env: + TEST_RAILS_VERSION: ${{ matrix.rails-version }} CC_TEST_REPORTER_ID: "${{ secrets.CC_TEST_REPORTER_ID }}" steps: - uses: actions/checkout@v4 From f255dd2b2cfbdab40d9f8d7738e86774c9ed82ae Mon Sep 17 00:00:00 2001 From: Joe Rafaniello Date: Tue, 24 Sep 2024 14:12:33 -0400 Subject: [PATCH 6/7] Add ruby 3.2 and 3.3 to the matrix for fun --- .github/workflows/ci.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index a909d16c..f1bc4e34 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -13,6 +13,8 @@ jobs: matrix: ruby-version: - '3.1' + - '3.2' + - '3.3' rails-version: - '7.0' - '7.1' From a8bd459e9bb7a61e9bbaa72794b54cd37e0c30a6 Mon Sep 17 00:00:00 2001 From: Jason Frey Date: Tue, 24 Sep 2024 14:18:35 -0400 Subject: [PATCH 7/7] Switch the CI matrix from include to exclude --- .github/workflows/ci.yaml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index f1bc4e34..ec9d8755 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -12,6 +12,7 @@ jobs: strategy: matrix: ruby-version: + - '3.0' - '3.1' - '3.2' - '3.3' @@ -19,11 +20,9 @@ jobs: - '7.0' - '7.1' - '7.2' - include: + exclude: - ruby-version: '3.0' - rails-version: '7.0' - - ruby-version: '3.0' - rails-version: '7.1' + rails-version: '7.2' env: TEST_RAILS_VERSION: ${{ matrix.rails-version }} CC_TEST_REPORTER_ID: "${{ secrets.CC_TEST_REPORTER_ID }}"