From b8edb59ef979473b56acf4eed9a3e98a6f49b6d1 Mon Sep 17 00:00:00 2001 From: Robert Waffen Date: Fri, 6 Sep 2024 10:20:13 +0200 Subject: [PATCH 1/2] feat: update to ruby 3.3.5 Signed-off-by: Robert Waffen --- .ruby-version | 2 +- .tool-versions | 2 +- DEVELOPMENT.md | 6 +++--- Dockerfile | 2 +- MANUAL_INSTALL.md | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.ruby-version b/.ruby-version index 6d5369b9..f13c6f45 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -ruby-3.3.4 +ruby-3.3.5 diff --git a/.tool-versions b/.tool-versions index 05668b72..1dd19980 100644 --- a/.tool-versions +++ b/.tool-versions @@ -1 +1 @@ -ruby 3.3.4 +ruby 3.3.5 diff --git a/DEVELOPMENT.md b/DEVELOPMENT.md index e135780f..71ad2cbc 100644 --- a/DEVELOPMENT.md +++ b/DEVELOPMENT.md @@ -10,12 +10,12 @@ In case you are using an Apple M1 Chip you might run into trouble building Ruby. A work around for that is using the command - rvm reinstall 3.3.4 --with-openssl-dir=$(brew --prefix openssl) --with-readline-dir=$(brew --prefix readline) --with-libyaml-dir=$(brew --prefix libyaml) --disable-dtrace --disable-docs + rvm reinstall 3.3.5 --with-openssl-dir=$(brew --prefix openssl) --with-readline-dir=$(brew --prefix readline) --with-libyaml-dir=$(brew --prefix libyaml) --disable-dtrace --disable-docs On intel you can proceed with the following: - rvm install 3.3.4 - rvm use 3.3.4 + rvm install 3.3.5 + rvm use 3.3.5 ## **Main part** diff --git a/Dockerfile b/Dockerfile index 61d28299..1f0a19bc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ruby:3.3.4-slim-bookworm +FROM ruby:3.3.5-slim-bookworm RUN apt update && apt install -y \ g++ \ diff --git a/MANUAL_INSTALL.md b/MANUAL_INSTALL.md index ac6ee4ea..5f536f5a 100644 --- a/MANUAL_INSTALL.md +++ b/MANUAL_INSTALL.md @@ -27,8 +27,8 @@ On Alma 8 you must install libyaml-devel: Now you can install the required ruby version: - rvm install 3.3.4 - rvm use 3.3.4 + rvm install 3.3.5 + rvm use 3.3.5 ### **Main part** From a4e6a5fa6bf31fa6b743853bda2e2ada8a18be46 Mon Sep 17 00:00:00 2001 From: Robert Waffen Date: Fri, 6 Sep 2024 11:10:35 +0200 Subject: [PATCH 2/2] fix: use .ruby-version file to determine version in shell commands Signed-off-by: Robert Waffen --- DEVELOPMENT.md | 8 +++++--- MANUAL_INSTALL.md | 5 +++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/DEVELOPMENT.md b/DEVELOPMENT.md index 71ad2cbc..0b2c75a6 100644 --- a/DEVELOPMENT.md +++ b/DEVELOPMENT.md @@ -10,12 +10,14 @@ In case you are using an Apple M1 Chip you might run into trouble building Ruby. A work around for that is using the command - rvm reinstall 3.3.5 --with-openssl-dir=$(brew --prefix openssl) --with-readline-dir=$(brew --prefix readline) --with-libyaml-dir=$(brew --prefix libyaml) --disable-dtrace --disable-docs + cd hdm + rvm reinstall $(cat .ruby-version) --with-openssl-dir=$(brew --prefix openssl) --with-readline-dir=$(brew --prefix readline) --with-libyaml-dir=$(brew --prefix libyaml) --disable-dtrace --disable-docs On intel you can proceed with the following: - rvm install 3.3.5 - rvm use 3.3.5 + cd hdm + rvm install $(cat .ruby-version) + rvm use $(cat .ruby-version) ## **Main part** diff --git a/MANUAL_INSTALL.md b/MANUAL_INSTALL.md index 5f536f5a..e3464c54 100644 --- a/MANUAL_INSTALL.md +++ b/MANUAL_INSTALL.md @@ -27,8 +27,9 @@ On Alma 8 you must install libyaml-devel: Now you can install the required ruby version: - rvm install 3.3.5 - rvm use 3.3.5 + cd hdm + rvm install $(cat .ruby-version) + rvm use $(cat .ruby-version) ### **Main part**