From 4609ac3f48bbf7b539898550bb9f465adbb8798b Mon Sep 17 00:00:00 2001 From: Haruyuki Iida Date: Mon, 22 Sep 2025 12:52:03 +0000 Subject: [PATCH] build: update Ruby and Redmine versions in Docker and workflow configurations --- .devcontainer/docker-compose.yml | 6 +++--- .github/workflows/build.yml | 15 +++++++-------- init.rb | 2 +- 3 files changed, 11 insertions(+), 12 deletions(-) diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml index a3daed1..f19220e 100644 --- a/.devcontainer/docker-compose.yml +++ b/.devcontainer/docker-compose.yml @@ -6,13 +6,13 @@ services: context: .. dockerfile: .devcontainer/Dockerfile args: - # Update 'VARIANT' to pick a version of Ruby: 3, 3.0, 2, 2.7, 2.6 + # Update 'VARIANT' to pick a version of Ruby: 3, 3.1, 3.2, 3.3, 3.4 # Append -bullseye or -buster to pin to an OS version. # Use -bullseye variants on local arm64/Apple Silicon. - RUBY_VERSION: "3.3" + RUBY_VERSION: "3.4" # Optional Node.js version to install NODE_VERSION: "lts/*" - REDMINE_VERSION: "6.0-stable" + REDMINE_VERSION: "6.1-stable" # Overrides default command so things don't shut down after the process ends. command: sleep infinity diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 03d783e..1b2b3a7 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -15,19 +15,14 @@ jobs: # Redmine 5.0-stable: Ruby 2.7, 3.0, 3.1 # Redmine 5.1-stable: Ruby 2.7, 3.0, 3.1, 3.2 # Redmine 6.0-stable: Ruby 3.1, 3.2, 3.3 - # Redmine master: Ruby 3.1, 3.2, 3.3 + # Redmine 6.1-stable: Ruby 3.2, 3.3, 3.4 + # Redmine master: Ruby 3.2, 3.3, 3.4 strategy: matrix: db: [sqlite3, mysql, postgres] ruby_version: ["3.0", "3.1", "3.2", "3.3", "3.4"] - redmine_version: [5.0-stable, 5.1-stable, 6.0-stable, master] + redmine_version: [5.1-stable, 6.0-stable, master] exclude: - - ruby_version: "3.2" - redmine_version: 5.0-stable - - ruby_version: "3.3" - redmine_version: 5.0-stable - - ruby_version: "3.4" - redmine_version: 5.0-stable - ruby_version: "3.3" redmine_version: 5.1-stable - ruby_version: "3.4" @@ -36,6 +31,10 @@ jobs: redmine_version: 6.0-stable - ruby_version: "3.4" redmine_version: 6.0-stable + - ruby_version: "3.0" + redmine_version: 6.1-stable + - ruby_version: "3.1" + redmine_version: 6.1-stable - ruby_version: "3.0" redmine_version: master - ruby_version: "3.1" diff --git a/init.rb b/init.rb index e5ea347..04b138b 100644 --- a/init.rb +++ b/init.rb @@ -37,7 +37,7 @@ url "http://www.redmine.org/plugins/redmine_code_review" if respond_to?(:url) description 'This is a Code Review plugin for Redmine' version '1.2.2' - requires_redmine :version_or_higher => '5.0.0' + requires_redmine :version_or_higher => '5.1.0' project_module :code_review do permission :view_code_review, {:code_review => [:update_diff_view, :update_attachment_view, :update_revisions_view, :index, :show]}, {:read => true}