Merge branch 'main' into ignore

betadots · Jul 11, 2024 · 6d68d2e · 6d68d2e
2 parents ae99f51 + 0bc4daa
commit 6d68d2e
Show file tree

Hide file tree

Showing 12 changed files with 118 additions and 108 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -58,7 +58,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Build Docker image
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           context: .
           tags: 'ci/hdm:${{ github.sha }}'

diff --git a/.github/workflows/trivy-analysis.yml b/.github/workflows/trivy-analysis.yml
@@ -24,7 +24,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Build Docker image
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           context: .
           tags: 'ci/hdm:${{ github.sha }}'

diff --git a/.ruby-version b/.ruby-version
@@ -1 +1 @@
-ruby-3.3.2
+ruby-3.3.4
diff --git a/.tool-versions b/.tool-versions
@@ -1 +1 @@
-ruby 3.3.1
+ruby 3.3.4
diff --git 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.1 --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.4 --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.1
-    rvm use 3.3.1
+    rvm install 3.3.4
+    rvm use 3.3.4
 
 ## **Main part**
 

diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ruby:3.3.2-slim-bookworm
+FROM ruby:3.3.4-slim-bookworm
 
 RUN apt update && apt install -y \
       g++ \
@@ -21,6 +21,7 @@ ENV APP_HOME /hdm
 ENV RAILS_ENV production
 ENV HDM_PORT 3000
 ENV HDM_HOST 0.0.0.0
+ENV RUBYOPT="--yjit"
 
 EXPOSE $HDM_PORT
 

diff --git a/Gemfile b/Gemfile
@@ -60,10 +60,10 @@ group :test do
 end
 
 group :linter do
-  gem 'rubocop', '~> 1.63.5'
-  gem 'rubocop-capybara', '~> 2.20.0'
-  gem 'rubocop-performance', '~> 1.21.0'
-  gem 'rubocop-rails', '~> 2.25.0'
+  gem 'rubocop', '~> 1.65.0'
+  gem 'rubocop-capybara', '~> 2.21.0'
+  gem 'rubocop-performance', '~> 1.21.1'
+  gem 'rubocop-rails', '~> 2.25.1'
   gem 'rubocop-rake', '~> 0.6.0'
 end