Update CI config: Include the latest Redmine versions

nanego · Oct 18, 2023 · 4ca3342 · 4ca3342
1 parent 71f2d5a
commit 4ca3342
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 12 deletions.
diff --git a/.github/workflows/5_0_5.yml → .github/workflows/4_2_11.yml b/.github/workflows/5_0_5.yml → .github/workflows/4_2_11.yml
@@ -1,8 +1,8 @@
-name: Tests 5.0.5
+name: Tests 4.2.11
 
 env:
   PLUGIN_NAME: redmine_datetime_custom_field
-  REDMINE_VERSION: 5.0.5
+  REDMINE_VERSION: 4.2.11
   RAILS_ENV: test
 
 on:
@@ -86,11 +86,9 @@ jobs:
           repository: jbbarth/redmine_base_rspec
           path: redmine/plugins/redmine_base_rspec
 
-      # Stay on rails-dom-testing gem version "2.0.3", because "2.1.1" is not fully compatible with Redmine 4.2.10 - TODO Remove this when Redmine 4.2.11 is released
       - name: Prepare Redmine source
         working-directory: redmine
         run: |
-          sed -i -e 's/.*rails-dom-testing.*/  gem "rails-dom-testing", "~> 2.0.3"/' Gemfile
           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_10.yml → .github/workflows/5_0_6.yml b/.github/workflows/4_2_10.yml → .github/workflows/5_0_6.yml
@@ -1,8 +1,8 @@
-name: Tests 4.2.10
+name: Tests 5.0.6
 
 env:
   PLUGIN_NAME: redmine_datetime_custom_field
-  REDMINE_VERSION: 4.2.10
+  REDMINE_VERSION: 5.0.6
   RAILS_ENV: test
 
 on:
@@ -86,11 +86,9 @@ jobs:
           repository: jbbarth/redmine_base_rspec
           path: redmine/plugins/redmine_base_rspec
 
-      # Stay on rails-dom-testing gem version "2.0.3", because "2.1.1" is not fully compatible with Redmine 4.2.10 - TODO Remove this when Redmine 4.2.11 is released
       - name: Prepare Redmine source
         working-directory: redmine
         run: |
-          sed -i -e 's/.*rails-dom-testing.*/  gem "rails-dom-testing", "~> 2.0.3"/' Gemfile
           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/README.md b/README.md
@@ -12,11 +12,11 @@ Note that this plugin has a dependency. You have to install this other plugin:
 
 |Plugin branch| Redmine Version | Test Status       |
 |-------------|-----------------|-------------------|
-|master       | 4.2.10          | [![4.2.10][1]][5] |  
-|master       | 5.0.5           | [![5.0.5][2]][5]  |
+|master       | 4.2.11          | [![4.2.11][1]][5] |  
+|master       | 5.0.6           | [![5.0.6][2]][5]  |
 |master       | master          | [![master][4]][5] |
 
-[1]: https://github.com/nanego/redmine_datetime_custom_field/actions/workflows/4_2_10.yml/badge.svg
-[2]: https://github.com/nanego/redmine_datetime_custom_field/actions/workflows/5_0_5.yml/badge.svg
+[1]: https://github.com/nanego/redmine_datetime_custom_field/actions/workflows/4_2_11.yml/badge.svg
+[2]: https://github.com/nanego/redmine_datetime_custom_field/actions/workflows/5_0_6.yml/badge.svg
 [4]: https://github.com/nanego/redmine_datetime_custom_field/actions/workflows/master.yml/badge.svg
 [5]: https://github.com/nanego/redmine_datetime_custom_field/actions