Update CI config: add Redmine 6 and drop support of Redmine 4

jbbarth · Dec 24, 2024 · 2eeb389 · 2eeb389
1 parent 1d75c0f
commit 2eeb389
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 16 deletions.
diff --git a/.github/workflows/5_1_2.yml → .github/workflows/5_1_5.yml b/.github/workflows/5_1_2.yml → .github/workflows/5_1_5.yml
@@ -1,8 +1,8 @@
-name: Tests 5.1.2
+name: Tests 5.1.5
 
 env:
   PLUGIN_NAME: redmine_drafts
-  REDMINE_VERSION: 5.1.2
+  REDMINE_VERSION: 5.1.5
   RAILS_ENV: test
 
 on:
@@ -89,8 +89,6 @@ jobs:
       - name: Prepare Redmine source
         working-directory: redmine
         run: |
-          # TODO Remove the following line when https://www.redmine.org/issues/40551 is fixed
-          sed -i -e 's/.*mocha.*/  gem "mocha", "2.1.0"/' Gemfile # Fix core tests not compatible with Mocha 2.2.0
           sed -i '/rubocop/d' Gemfile
           rm -f .rubocop*
           cp plugins/redmine_base_rspec/spec/support/database-${{ matrix.db }}.yml config/database.yml

diff --git a/.github/workflows/4_2_11.yml → .github/workflows/6_0_2.yml b/.github/workflows/4_2_11.yml → .github/workflows/6_0_2.yml
@@ -1,8 +1,8 @@
-name: Tests 4.2.11
+name: Tests 6.0.2
 
 env:
   PLUGIN_NAME: redmine_drafts
-  REDMINE_VERSION: 4.2.11
+  REDMINE_VERSION: 6.0.2
   RAILS_ENV: test
 
 on:
@@ -16,7 +16,7 @@ jobs:
 
     strategy:
       matrix:
-        ruby: ['2.7']
+        ruby: ['3.3']
         db: ['postgres']
       fail-fast: false
 
@@ -89,8 +89,6 @@ jobs:
       - name: Prepare Redmine source
         working-directory: redmine
         run: |
-          # TODO Remove the following line when https://www.redmine.org/issues/40551 is fixed
-          sed -i -e 's/.*mocha.*/  gem "mocha", "2.1.0"/' Gemfile # Fix core tests not compatible with Mocha 2.2.0
           sed -i '/rubocop/d' Gemfile
           rm -f .rubocop*
           cp plugins/redmine_base_rspec/spec/support/database-${{ matrix.db }}.yml config/database.yml

diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml
@@ -16,7 +16,7 @@ jobs:
 
     strategy:
       matrix:
-        ruby: ['3.2']
+        ruby: ['3.3']
         db: ['postgres']
       fail-fast: false
 

diff --git a/README.md b/README.md
@@ -17,12 +17,12 @@ Then :
 
 |Plugin branch| Redmine Version | Test Status       |
 |-------------|-----------------|-------------------|
-|master       | 4.2.11          | [![4.2.11][1]][5] |
-|master       | 5.1.2           | [![5.1.2][2]][5]  |
+|master       | 6.0.2           | [![6.0.2][1]][5]  |
+|master       | 5.1.5           | [![5.1.5][2]][5]  |
 |master       | master          | [![master][4]][5] |
 
-[1]: https://github.com/jbbarth/redmine_drafts/actions/workflows/4_2_11.yml/badge.svg
-[2]: https://github.com/jbbarth/redmine_drafts/actions/workflows/5_1_2.yml/badge.svg
+[1]: https://github.com/jbbarth/redmine_drafts/actions/workflows/6_0_2.yml/badge.svg
+[2]: https://github.com/jbbarth/redmine_drafts/actions/workflows/5_1_5.yml/badge.svg
 [4]: https://github.com/jbbarth/redmine_drafts/actions/workflows/master.yml/badge.svg
 [5]: https://github.com/jbbarth/redmine_drafts/actions
 

diff --git a/app/controllers/drafts_controller.rb b/app/controllers/drafts_controller.rb
@@ -1,5 +1,4 @@
 class DraftsController < ApplicationController
-  unloadable
 
   before_action :require_login
 

diff --git a/lib/redmine_drafts/issue_patch.rb b/lib/redmine_drafts/issue_patch.rb
@@ -11,7 +11,7 @@ def clean_drafts_after_update
   end
 end
 
-class Issue < ActiveRecord::Base
+class Issue
 
   include RedmineDrafts::IssuePatch
-Original file line number
+Diff line change
@@ Expand Up / @@ -11,7 +11,7 @@ def clean_drafts_after_update @@
       end
     end
-    class Issue < ActiveRecord::Base
+    class Issue
       include RedmineDrafts::IssuePatch
@@ Expand Down @@