Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Ruby version #1848

Merged
merged 1 commit into from
Nov 9, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ jobs:
- name: Set up Ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: '3.3.5'
ruby-version: '3.3.6'
bundler-cache: true
- uses: pnpm/action-setup@v4
- name: Set up Node
Expand Down
8 changes: 5 additions & 3 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
if: steps.changed-files.outputs.any_changed == 'true'
uses: ruby/setup-ruby@v1
with:
ruby-version: '3.3.5'
ruby-version: '3.3.6'
bundler-cache: true
- name: Run RuboCop
if: steps.changed-files.outputs.any_changed == 'true'
Expand All @@ -53,7 +53,7 @@ jobs:
if: steps.changed-files.outputs.any_changed == 'true'
uses: ruby/setup-ruby@v1
with:
ruby-version: '3.3.5'
ruby-version: '3.3.6'
bundler-cache: true
- name: Run Slim-Lint
if: steps.changed-files.outputs.any_changed == 'true'
Expand Down Expand Up @@ -108,6 +108,8 @@ jobs:
cache: 'pnpm'
- name: Install node dependencies
run: pnpm install
- name: Install stylelint GitHub formatter
run: pnpm install @csstools/stylelint-formatter-github
- name: Run Stylelint
if: steps.changed-files.outputs.any_changed == 'true'
run: pnpm stylelint app/**/*.{scss,css} --formatter=github
run: pnpm stylelint app/**/*.{scss,css} --custom-formatter @csstools/stylelint-formatter-github
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ git_source(:github) do |repo_name|
"https://github.com/#{repo_name}.git"
end

ruby '3.3.5'
ruby '3.3.6'

gem 'rails', '7.1.5'

Expand Down
4 changes: 2 additions & 2 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -536,7 +536,7 @@ DEPENDENCIES
webmock

RUBY VERSION
ruby 3.3.5p100
ruby 3.3.6p108

BUNDLED WITH
2.5.23
2.5.22
2 changes: 1 addition & 1 deletion docker/icare/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# syntax = docker/dockerfile:1

# Make sure RUBY_VERSION matches the Ruby version in .ruby-version and Gemfile
ARG RUBY_VERSION=3.3.5
ARG RUBY_VERSION=3.3.6
FROM registry.docker.com/library/ruby:$RUBY_VERSION-slim as base

# Rails app lives here
Expand Down