Skip to content

Commit 2eeb389

Browse files
committed
Update CI config: add Redmine 6 and drop support of Redmine 4
1 parent 1d75c0f commit 2eeb389

File tree

6 files changed

+11
-16
lines changed

6 files changed

+11
-16
lines changed

.github/workflows/5_1_2.yml renamed to .github/workflows/5_1_5.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
name: Tests 5.1.2
1+
name: Tests 5.1.5
22

33
env:
44
PLUGIN_NAME: redmine_drafts
5-
REDMINE_VERSION: 5.1.2
5+
REDMINE_VERSION: 5.1.5
66
RAILS_ENV: test
77

88
on:
@@ -89,8 +89,6 @@ jobs:
8989
- name: Prepare Redmine source
9090
working-directory: redmine
9191
run: |
92-
# TODO Remove the following line when https://www.redmine.org/issues/40551 is fixed
93-
sed -i -e 's/.*mocha.*/ gem "mocha", "2.1.0"/' Gemfile # Fix core tests not compatible with Mocha 2.2.0
9492
sed -i '/rubocop/d' Gemfile
9593
rm -f .rubocop*
9694
cp plugins/redmine_base_rspec/spec/support/database-${{ matrix.db }}.yml config/database.yml

.github/workflows/4_2_11.yml renamed to .github/workflows/6_0_2.yml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
name: Tests 4.2.11
1+
name: Tests 6.0.2
22

33
env:
44
PLUGIN_NAME: redmine_drafts
5-
REDMINE_VERSION: 4.2.11
5+
REDMINE_VERSION: 6.0.2
66
RAILS_ENV: test
77

88
on:
@@ -16,7 +16,7 @@ jobs:
1616

1717
strategy:
1818
matrix:
19-
ruby: ['2.7']
19+
ruby: ['3.3']
2020
db: ['postgres']
2121
fail-fast: false
2222

@@ -89,8 +89,6 @@ jobs:
8989
- name: Prepare Redmine source
9090
working-directory: redmine
9191
run: |
92-
# TODO Remove the following line when https://www.redmine.org/issues/40551 is fixed
93-
sed -i -e 's/.*mocha.*/ gem "mocha", "2.1.0"/' Gemfile # Fix core tests not compatible with Mocha 2.2.0
9492
sed -i '/rubocop/d' Gemfile
9593
rm -f .rubocop*
9694
cp plugins/redmine_base_rspec/spec/support/database-${{ matrix.db }}.yml config/database.yml

.github/workflows/master.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616

1717
strategy:
1818
matrix:
19-
ruby: ['3.2']
19+
ruby: ['3.3']
2020
db: ['postgres']
2121
fail-fast: false
2222

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@ Then :
1717

1818
|Plugin branch| Redmine Version | Test Status |
1919
|-------------|-----------------|-------------------|
20-
|master | 4.2.11 | [![4.2.11][1]][5] |
21-
|master | 5.1.2 | [![5.1.2][2]][5] |
20+
|master | 6.0.2 | [![6.0.2][1]][5] |
21+
|master | 5.1.5 | [![5.1.5][2]][5] |
2222
|master | master | [![master][4]][5] |
2323

24-
[1]: https://github.com/jbbarth/redmine_drafts/actions/workflows/4_2_11.yml/badge.svg
25-
[2]: https://github.com/jbbarth/redmine_drafts/actions/workflows/5_1_2.yml/badge.svg
24+
[1]: https://github.com/jbbarth/redmine_drafts/actions/workflows/6_0_2.yml/badge.svg
25+
[2]: https://github.com/jbbarth/redmine_drafts/actions/workflows/5_1_5.yml/badge.svg
2626
[4]: https://github.com/jbbarth/redmine_drafts/actions/workflows/master.yml/badge.svg
2727
[5]: https://github.com/jbbarth/redmine_drafts/actions
2828

app/controllers/drafts_controller.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
class DraftsController < ApplicationController
2-
unloadable
32

43
before_action :require_login
54

lib/redmine_drafts/issue_patch.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ def clean_drafts_after_update
1111
end
1212
end
1313

14-
class Issue < ActiveRecord::Base
14+
class Issue
1515

1616
include RedmineDrafts::IssuePatch
1717

0 commit comments

Comments
 (0)