From fa8bb7b98b62a793d7f03ee9eb8126be461fcc71 Mon Sep 17 00:00:00 2001 From: Klaus Zanders Date: Mon, 17 Feb 2025 08:50:39 +0100 Subject: [PATCH] Update ruby to 3.4.2 --- .github/workflows/danger.yml | 10 +++++----- .ruby-version | 2 +- Gemfile.lock | 2 +- docker/dev/backend/Dockerfile | 10 +++++----- docker/prod/Dockerfile | 2 +- .../development-environment/linux/README.md | 12 ++++++------ .../development-environment/macos/README.md | 10 +++++----- .../installation/manual/README.md | 12 ++++++------ nix/gemset.nix | 2 +- 9 files changed, 31 insertions(+), 31 deletions(-) diff --git a/.github/workflows/danger.yml b/.github/workflows/danger.yml index be8948af8a7..17f040cb33f 100644 --- a/.github/workflows/danger.yml +++ b/.github/workflows/danger.yml @@ -5,8 +5,8 @@ on: branches: - release/* paths: - - 'db/migrate/**.rb' - - 'modules/**/db/migrate/*.rb' + - "db/migrate/**.rb" + - "modules/**/db/migrate/*.rb" jobs: danger: @@ -17,10 +17,10 @@ jobs: - uses: actions/checkout@v4 - uses: ruby/setup-ruby@v1 with: - ruby-version: '3.4.1' + ruby-version: "3.4.2" - uses: MeilCli/danger-action@v6 with: - danger_file: 'Dangerfile' - danger_id: 'danger-pr' + danger_file: "Dangerfile" + danger_id: "danger-pr" env: DANGER_GITHUB_API_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.ruby-version b/.ruby-version index 47b322c971c..4d9d11cf505 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -3.4.1 +3.4.2 diff --git a/Gemfile.lock b/Gemfile.lock index 657efe602e2..bab6885873d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1914,7 +1914,7 @@ CHECKSUMS zeitwerk (2.7.1) sha256=0945986050e4907140895378e74df1fe882a2271ed087cc6c6d6b00d415a2756 RUBY VERSION - ruby 3.4.1p0 + ruby 3.4.2p28 BUNDLED WITH 2.6.3 diff --git a/docker/dev/backend/Dockerfile b/docker/dev/backend/Dockerfile index 4247efbd51c..1b13540bbec 100644 --- a/docker/dev/backend/Dockerfile +++ b/docker/dev/backend/Dockerfile @@ -1,4 +1,4 @@ -FROM ruby:3.4.1-bullseye AS develop +FROM ruby:3.4.2-bullseye AS develop MAINTAINER operations@openproject.com ARG DEV_UID=1000 @@ -21,8 +21,8 @@ RUN groupmod -g $DEV_GID $USER || true WORKDIR /home/$USER RUN apt-get update -qq && \ - DEBIAN_FRONTEND=noninteractive apt-get install -y \ - postgresql-client libffi7 libffi-dev curl + DEBIAN_FRONTEND=noninteractive apt-get install -y \ + postgresql-client libffi7 libffi-dev curl # Setup node source and install nodejs. Needed for running certain scripts in backend container, # as the `./scripts/api/validate_spec`. @@ -59,8 +59,8 @@ FROM develop AS test USER root RUN apt-get update -qq && \ - DEBIAN_FRONTEND=noninteractive apt-get install -y \ - jq + DEBIAN_FRONTEND=noninteractive apt-get install -y \ + jq COPY ./docker/dev/backend/scripts/run-test /usr/bin/run-test COPY ./docker/dev/backend/scripts/setup-tests /usr/bin/setup-tests diff --git a/docker/prod/Dockerfile b/docker/prod/Dockerfile index 42d7cf89f73..28810521933 100755 --- a/docker/prod/Dockerfile +++ b/docker/prod/Dockerfile @@ -1,4 +1,4 @@ -ARG RUBY_VERSION="3.4.1" +ARG RUBY_VERSION="3.4.2" FROM ruby:${RUBY_VERSION}-bookworm AS base LABEL maintainer="operations@openproject.com" diff --git a/docs/development/development-environment/linux/README.md b/docs/development/development-environment/linux/README.md index f42ab24c667..aa668294bcc 100644 --- a/docs/development/development-environment/linux/README.md +++ b/docs/development/development-environment/linux/README.md @@ -40,10 +40,10 @@ sudo apt-get install git curl build-essential zlib1g-dev libyaml-dev libssl-dev Use [rbenv](https://github.com/rbenv/rbenv) and [ruby-build](https://github.com/rbenv/ruby-build#readme) to install Ruby. You can check available ruby versions with `rbenv install --list`. -At the time of this writing, the latest stable version is `3.4.1`, which we also require. +At the time of this writing, the latest stable version is `3.4.2`, which we also require. We suggest you install the version we require in [.ruby-version](https://github.com/opf/openproject/blob/dev/.ruby-version). -Read the first line e.g. `3.4.1` and install that version. +Read the first line e.g. `3.4.2` and install that version. #### Install rbenv and ruby-build @@ -80,18 +80,18 @@ With both installed, we can now install ruby. You can check available ruby versions with `rbenv install --list`. We suggest you install the version we require in [.ruby-version](https://github.com/opf/openproject/blob/dev/.ruby-version). -Read the first line e.g. `3.4.1` and install that version. +Read the first line e.g. `3.4.2` and install that version. ```shell # Install the required version as read from the .ruby-version file -rbenv install 3.4.1 +rbenv install 3.4.2 ``` This might take a while depending on whether ruby is built from source. After it is complete, you need to tell rbenv to globally activate this version ```shell -rbenv global 3.4.1 +rbenv global 3.4.2 rbenv rehash ``` @@ -181,7 +181,7 @@ You should now have an active ruby and node installation. Verify that it works w ```shell ruby --version -ruby 3.4.1 (2024-12-25 revision 48d4efcb85) +PRISM [arm64-darwin23] +ruby 3.4.2 (2024-12-25 revision 48d4efcb85) +PRISM [arm64-darwin23] bundler --version Bundler version 2.6.3 diff --git a/docs/development/development-environment/macos/README.md b/docs/development/development-environment/macos/README.md index 606a4028488..1f466d4876f 100644 --- a/docs/development/development-environment/macos/README.md +++ b/docs/development/development-environment/macos/README.md @@ -28,7 +28,7 @@ their homepage. Use [rbenv](https://github.com/rbenv/rbenv) and [ruby-build](https://github.com/rbenv/ruby-build#readme) to install Ruby. We always require the latest ruby versions, and you can check which version is required by [checking the Gemfile](https://github.com/opf/openproject/blob/dev/Gemfile#L31) for the `ruby "~> X.Y"` statement. At -the time of writing, this version is "3.4.1" +the time of writing, this version is "3.4.2" #### Install rbenv and ruby-build @@ -48,18 +48,18 @@ With both installed, we can now install the actual ruby version. You can check available ruby versions with `rbenv install --list`. We suggest you install the version we require in [.ruby-version](https://github.com/opf/openproject/blob/dev/.ruby-version). -Read the first line e.g. `3.4.1` and install that version. +Read the first line e.g. `3.4.2` and install that version. ```shell # Install the required version as read from the .ruby-version file -rbenv install 3.4.1 +rbenv install 3.4.2 ``` This might take a while depending on whether ruby is built from source. After it is complete, you need to tell rbenv to globally activate this version ```shell -rbenv global 3.4.1 +rbenv global 3.4.2 ``` You also need to install [bundler](https://github.com/bundler/bundler/), the ruby gem bundler. @@ -134,7 +134,7 @@ You should now have an active ruby and node installation. Verify that it works w ```shell $ ruby --version -ruby 3.4.1 (2024-12-25 revision 48d4efcb85) +PRISM [arm64-darwin23] +ruby 3.4.2 (2025-02-15 revision d2930f8e7a) +PRISM [arm64-darwin24] $ bundler --version Bundler version 2.6.3 diff --git a/docs/installation-and-operations/installation/manual/README.md b/docs/installation-and-operations/installation/manual/README.md index 075cb69d2eb..5dde7613110 100644 --- a/docs/installation-and-operations/installation/manual/README.md +++ b/docs/installation-and-operations/installation/manual/README.md @@ -96,8 +96,8 @@ Lastly, revert to the previous system user: ## Installation of Ruby -The are several possibilities to install Ruby on your machine. -We will use [rbenv](https://github.com/rbenv/rbenv). +The are several possibilities to install Ruby on your machine. +We will use [rbenv](https://github.com/rbenv/rbenv). Please be aware that the actual installation of a specific Ruby version takes some time to finish. ```shell @@ -110,19 +110,19 @@ Please be aware that the actual installation of a specific Ruby version takes so ``` We suggest you install the version we require in [.ruby-version](https://github.com/opf/openproject/blob/dev/.ruby-version). -Read the first line e.g. `3.4.1` and install that version. +Read the first line e.g. `3.4.2` and install that version. ```shell -[openproject@host] rbenv install 3.4.1 +[openproject@host] rbenv install 3.4.2 [openproject@host] rbenv rehash -[openproject@host] rbenv global 3.4.1 +[openproject@host] rbenv global 3.4.2 ``` To check our Ruby installation we run `ruby --version`. It should output something very similar to: ```text -ruby 3.4.1 (2024-12-25 revision 48d4efcb85) +PRISM [arm64-darwin23] +ruby 3.4.2 (2025-02-15 revision d2930f8e7a) +PRISM [arm64-darwin24] ``` ## Installation of Node diff --git a/nix/gemset.nix b/nix/gemset.nix index 701134df1c6..db77431ee4e 100644 --- a/nix/gemset.nix +++ b/nix/gemset.nix @@ -1633,7 +1633,7 @@ sha256 = "0imzd0cb9vlkc3yggl4rph1v1wm4z9psgs4z6aqsqa5hgf8gr9hj"; type = "gem"; }; - version = "3.4.1"; + version = "3.4.2"; }; livingstyleguide = { dependencies = ["minisyntax" "redcarpet" "sassc" "thor" "tilt"];