From f32c3fc1f3071994a400ad1b7ccdbb96ac9b378d Mon Sep 17 00:00:00 2001 From: Vincent Date: Mon, 23 Dec 2024 17:19:03 +0100 Subject: [PATCH] Update CI config: add Redmine 6 and drop support of Redmine 4 --- .github/workflows/{5_1_2.yml => 5_1_5.yml} | 6 ++---- .github/workflows/{4_2_11.yml => 6_0_2.yml} | 9 ++++----- .github/workflows/master.yml | 2 +- README.md | 16 ++++++++-------- 4 files changed, 15 insertions(+), 18 deletions(-) rename .github/workflows/{5_1_2.yml => 5_1_5.yml} (94%) rename .github/workflows/{4_2_11.yml => 6_0_2.yml} (94%) diff --git a/.github/workflows/5_1_2.yml b/.github/workflows/5_1_5.yml similarity index 94% rename from .github/workflows/5_1_2.yml rename to .github/workflows/5_1_5.yml index 2c37b7f..24dc862 100644 --- a/.github/workflows/5_1_2.yml +++ b/.github/workflows/5_1_5.yml @@ -1,8 +1,8 @@ -name: Tests 5.1.2 +name: Tests 5.1.5 env: PLUGIN_NAME: redmine_customize_core_fields - 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 rm -f test/integration/routing/plugins_test.rb # Fix routing tests # TODO Remove this line when https://www.redmine.org/issues/38707 is fixed sed -i '/rubocop/d' Gemfile rm -f .rubocop* diff --git a/.github/workflows/4_2_11.yml b/.github/workflows/6_0_2.yml similarity index 94% rename from .github/workflows/4_2_11.yml rename to .github/workflows/6_0_2.yml index 224ab68..2811a97 100644 --- a/.github/workflows/4_2_11.yml +++ b/.github/workflows/6_0_2.yml @@ -1,8 +1,8 @@ -name: Tests 4.2.11 +name: Tests 6.0.2 env: PLUGIN_NAME: redmine_customize_core_fields - 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,7 @@ 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 + rm -f test/integration/routing/plugins_test.rb # Fix routing tests # TODO Remove this line when https://www.redmine.org/issues/38707 is fixed 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 index 9c5d83b..f09eab6 100644 --- 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 index 7452d2f..a67b09c 100644 --- a/README.md +++ b/README.md @@ -32,14 +32,14 @@ And finally restart your Redmine instance. Test status ------------ -| Plugin branch | Redmine Version | Test Status | -|---------------|-----------------|--------------------| -| master | 5.1.2 | [![5.1.2][1]][5] | -| master | 4.2.11 | [![4.2.11][2]][5] | -| master | master | [![master][4]][5] | - -[1]: https://github.com/nanego/redmine_customize_core_fields/actions/workflows/5_1_2.yml/badge.svg -[2]: https://github.com/nanego/redmine_customize_core_fields/actions/workflows/4_2_11.yml/badge.svg +| Plugin branch | Redmine Version | Test Status | +|---------------|-----------------|-------------------| +| master | 5.1.5 | [![5.1.5][1]][5] | +| master | 6.0.2 | [![6.0.2][2]][5] | +| master | master | [![master][4]][5] | + +[1]: https://github.com/nanego/redmine_customize_core_fields/actions/workflows/5_1_5.yml/badge.svg +[2]: https://github.com/nanego/redmine_customize_core_fields/actions/workflows/6_0_2.yml/badge.svg [4]: https://github.com/nanego/redmine_customize_core_fields/actions/workflows/master.yml/badge.svg [5]: https://github.com/nanego/redmine_customize_core_fields/actions