diff --git a/.github/workflows/5_1_3.yml b/.github/workflows/5_1_4.yml similarity index 94% rename from .github/workflows/5_1_3.yml rename to .github/workflows/5_1_4.yml index 44f5426..ec024ec 100644 --- a/.github/workflows/5_1_3.yml +++ b/.github/workflows/5_1_4.yml @@ -1,8 +1,8 @@ -name: Tests 5.1.3 +name: Tests 5.1.4 env: PLUGIN_NAME: redmine_organizations - REDMINE_VERSION: 5.1.3 + REDMINE_VERSION: 5.1.4 on: push: @@ -88,8 +88,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_1.yml similarity index 93% rename from .github/workflows/4_2_11.yml rename to .github/workflows/6_0_1.yml index bb043f0..3a52473 100644 --- a/.github/workflows/4_2_11.yml +++ b/.github/workflows/6_0_1.yml @@ -1,8 +1,8 @@ -name: Tests 4.2.11 +name: Tests 6.0.1 env: PLUGIN_NAME: redmine_organizations - REDMINE_VERSION: 4.2.11 + REDMINE_VERSION: 6.0.1 on: push: @@ -15,7 +15,7 @@ jobs: strategy: matrix: - ruby: ['2.7'] + ruby: ['3.3'] db: ['postgres'] fail-fast: false @@ -88,12 +88,10 @@ 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 - echo 'gem "builder", "~> 3.2.4"' >> Gemfile - name: Install Ruby dependencies working-directory: redmine diff --git a/README.md b/README.md index a941970..ae674d6 100644 --- a/README.md +++ b/README.md @@ -11,11 +11,11 @@ Tests status |Plugin branch| Redmine Version | Test Status | |-------------|-----------------|-------------------| -|master | 4.2.11 | [![4.2.11][1]][5] | -|master | 5.1.3 | [![5.1.3][2]][5] | +|master | 6.0.1 | [![6.0.1][1]][5] | +|master | 5.1.4 | [![5.1.4][2]][5] | |master | master | [![master][4]][5] | -[1]: https://github.com/jbbarth/redmine_organizations/actions/workflows/4_2_11.yml/badge.svg -[2]: https://github.com/jbbarth/redmine_organizations/actions/workflows/5_1_3.yml/badge.svg +[1]: https://github.com/jbbarth/redmine_organizations/actions/workflows/6_0_1.yml/badge.svg +[2]: https://github.com/jbbarth/redmine_organizations/actions/workflows/5_1_4.yml/badge.svg [4]: https://github.com/jbbarth/redmine_organizations/actions/workflows/master.yml/badge.svg [5]: https://github.com/jbbarth/redmine_organizations/actions