Skip to content

Commit

Permalink
Revert Ruby version to 3.4.1 --> 3.3.5
Browse files Browse the repository at this point in the history
  • Loading branch information
mpressen committed Dec 28, 2024
1 parent 4f4559a commit 14660b5
Show file tree
Hide file tree
Showing 8 changed files with 55 additions and 62 deletions.
33 changes: 10 additions & 23 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,9 @@
"dockerComposeFile": "compose.yaml",
"service": "benefactorum",
"workspaceFolder": "/workspaces/${localWorkspaceFolderBasename}",

"containerEnv": {
"VITE_RUBY_HOST": "0.0.0.0"
},

// Features to add to the dev container. More info: https://containers.dev/features.
"features": {
"ghcr.io/devcontainers/features/common-utils:2": {
Expand All @@ -24,12 +22,10 @@
"ghcr.io/duduribeiro/devcontainer-features/tmux:1": {},
"ghcr.io/rails/devcontainer/features/bundler-cache:1": {}
},

// Use 'forwardPorts' to make a list of ports inside the container available locally.
"forwardPorts": [
3000
],

// Run `git update-index --assume-unchanged .devcontainer/devcontainer.json`
// if you want to ignore local changes to this file.
"customizations": {
Expand All @@ -38,47 +34,38 @@
"[ruby]": {
"editor.defaultFormatter": "Shopify.ruby-lsp"
},
"[typescriptreact]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
"editor.formatOnSave": true,
"eslint.validate": [
"javascript",
"javascriptreact",
"typescript",
"typescriptreact"
],
"rubyLsp.formatter": "standard",
"rubyLsp.linters": [
"standard"
]
],
"standard.validate": [
"typescript",
"typescriptreact"
],
"standard.engine": "ts-standard",
"standard.autoFixOnSave": true
},
"extensions": [
"numso.prettier-standard-vscode",
"shopify.ruby-lsp",
"standard.vscode-standard"
]
}
},

// Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root.
// "remoteUser": "root",

// Run `git update-index --assume-unchanged .devcontainer/devcontainer.json`
// if you want to ignore local changes to this file.
"mounts": [
// Keep your irb history between sessions
// "source=${HOME}/.irb-history,target=/home/vscode/.irb-history,type=bind",

// Keep command line history between sessions
// If you use bash
// "source=${HOME}/.bash_history,target=/home/vscode/.bash_history,type=bind",
// If you use zsh
// "source=${HOME}/.zsh_history,target=/home/vscode/.zsh_history,type=bind",
// "source=${HOME}/.zshrc,target=/home/vscode/.zshrc,type=bind",
// "source=${HOME}/.oh-my-zsh,target=/home/vscode/.oh-my-zsh,type=bind"

// "source=${HOME}/.zsh_history,target=/home/vscode/.zsh_history,type=bind",
// "source=${HOME}/.zshrc,target=/home/vscode/.zshrc,type=bind",
// "source=${HOME}/.oh-my-zsh,target=/home/vscode/.oh-my-zsh,type=bind"
],
"postCreateCommand": "bin/setup --skip-server"

}
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
uses: actions/[email protected]

- name: Set up Ruby
uses: ruby/setup-ruby@v1.204.0
uses: ruby/setup-ruby@v1.206.0
with:
ruby-version: .ruby-version
bundler-cache: true
Expand All @@ -35,7 +35,7 @@ jobs:
uses: actions/[email protected]

- name: Set up Ruby
uses: ruby/setup-ruby@v1.204.0
uses: ruby/setup-ruby@v1.206.0
with:
ruby-version: .ruby-version
bundler-cache: true
Expand Down Expand Up @@ -74,7 +74,7 @@ jobs:
uses: actions/[email protected]

- name: Set up Ruby
uses: ruby/setup-ruby@v1.204.0
uses: ruby/setup-ruby@v1.206.0
with:
ruby-version: .ruby-version
bundler-cache: true
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy-review.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
uses: actions/[email protected]

- name: Set up Ruby
uses: ruby/setup-ruby@v1.204.0
uses: ruby/setup-ruby@v1.206.0
with:
ruby-version: .ruby-version
bundler-cache: true
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy-staging.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
uses: actions/[email protected]

- name: Set up Ruby
uses: ruby/setup-ruby@v1.204.0
uses: ruby/setup-ruby@v1.206.0
with:
ruby-version: .ruby-version
bundler-cache: true
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
uses: actions/[email protected]

- name: Set up Ruby
uses: ruby/setup-ruby@v1.204.0
uses: ruby/setup-ruby@v1.206.0
with:
ruby-version: .ruby-version
bundler-cache: true
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/remove-review.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
uses: actions/[email protected]

- name: Set up Ruby
uses: ruby/setup-ruby@v1.204.0
uses: ruby/setup-ruby@v1.206.0
with:
ruby-version: .ruby-version
bundler-cache: true
Expand Down
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ gem "inertia_rails"

gem "vite_rails", "~> 3.0.19"
# Use sqlite3 as the database for Active Record
gem "sqlite3", ">= 2.4.1"
gem "sqlite3"
# Use the Puma web server [https://github.com/puma/puma]
gem "puma", ">= 6.5.0"

Expand Down
68 changes: 37 additions & 31 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,8 @@ GEM
ast (2.4.2)
authentication-zero (4.0.3)
aws-eventstream (1.3.0)
aws-partitions (1.1025.0)
aws-sdk-core (3.214.0)
aws-partitions (1.1029.0)
aws-sdk-core (3.214.1)
aws-eventstream (~> 1, >= 1.3.0)
aws-partitions (~> 1, >= 1.992.0)
aws-sigv4 (~> 1.9)
Expand All @@ -95,10 +95,8 @@ GEM
base64 (0.2.0)
bcrypt (3.1.20)
bcrypt_pbkdf (1.1.1)
bcrypt_pbkdf (1.1.1-arm64-darwin)
bcrypt_pbkdf (1.1.1-x86_64-darwin)
benchmark (0.4.0)
bigdecimal (3.1.8)
bigdecimal (3.1.9)
bindex (0.8.1)
bootsnap (1.18.4)
msgpack (~> 1.2)
Expand Down Expand Up @@ -126,7 +124,7 @@ GEM
drb (2.2.1)
dry-cli (1.2.0)
ed25519 (1.3.0)
erubi (1.13.0)
erubi (1.13.1)
et-orbi (1.2.11)
tzinfo
factory_bot (6.5.0)
Expand Down Expand Up @@ -185,12 +183,13 @@ GEM
marcel (1.0.4)
matrix (0.4.2)
mini_mime (1.1.5)
mini_portile2 (2.8.8)
minitest (5.25.4)
msgpack (1.7.5)
mutex_m (0.3.0)
net-http (0.6.0)
uri
net-imap (0.5.2)
net-imap (0.5.4)
date
net-protocol
net-pop (0.1.2)
Expand All @@ -205,17 +204,24 @@ GEM
net-protocol
net-ssh (7.3.0)
nio4r (2.7.4)
nokogiri (1.17.2-aarch64-linux)
nokogiri (1.18.0)
mini_portile2 (~> 2.8.2)
racc (~> 1.4)
nokogiri (1.17.2-arm-linux)
nokogiri (1.18.0-aarch64-linux-gnu)
racc (~> 1.4)
nokogiri (1.17.2-arm64-darwin)
nokogiri (1.18.0-aarch64-linux-musl)
racc (~> 1.4)
nokogiri (1.17.2-x86-linux)
nokogiri (1.18.0-arm-linux-gnu)
racc (~> 1.4)
nokogiri (1.17.2-x86_64-darwin)
nokogiri (1.18.0-arm-linux-musl)
racc (~> 1.4)
nokogiri (1.17.2-x86_64-linux)
nokogiri (1.18.0-arm64-darwin)
racc (~> 1.4)
nokogiri (1.18.0-x86_64-darwin)
racc (~> 1.4)
nokogiri (1.18.0-x86_64-linux-gnu)
racc (~> 1.4)
nokogiri (1.18.0-x86_64-linux-musl)
racc (~> 1.4)
ostruct (0.6.1)
overmind (2.5.1)
Expand All @@ -228,7 +234,7 @@ GEM
parser (3.3.6.0)
ast (~> 2.4.1)
racc
prism (1.2.0)
prism (1.3.0)
psych (5.2.2)
date
stringio
Expand All @@ -242,7 +248,7 @@ GEM
rack
rack-session (2.0.0)
rack (>= 3.0.0)
rack-test (2.1.0)
rack-test (2.2.0)
rack (>= 1.3)
rackup (2.2.1)
rack (>= 3)
Expand Down Expand Up @@ -277,11 +283,11 @@ GEM
zeitwerk (~> 2.6)
rainbow (3.1.1)
rake (13.2.1)
rbs (3.7.0)
rbs (3.8.1)
logger
rdoc (6.10.0)
psych (>= 4.0.0)
regexp_parser (2.9.3)
regexp_parser (2.10.0)
reline (0.6.0)
io-console (~> 0.5)
rexml (3.4.0)
Expand Down Expand Up @@ -350,24 +356,24 @@ GEM
activejob (>= 7.2)
activerecord (>= 7.2)
railties (>= 7.2)
solid_queue (1.1.0)
solid_queue (1.1.2)
activejob (>= 7.1)
activerecord (>= 7.1)
concurrent-ruby (>= 1.3.1)
fugit (~> 1.11.0)
railties (>= 7.1)
thor (~> 1.3.1)
sorbet-runtime (0.5.11704)
sqlite3 (2.4.1-aarch64-linux-gnu)
sqlite3 (2.4.1-aarch64-linux-musl)
sqlite3 (2.4.1-arm-linux-gnu)
sqlite3 (2.4.1-arm-linux-musl)
sqlite3 (2.4.1-arm64-darwin)
sqlite3 (2.4.1-x86-linux-gnu)
sqlite3 (2.4.1-x86-linux-musl)
sqlite3 (2.4.1-x86_64-darwin)
sqlite3 (2.4.1-x86_64-linux-gnu)
sqlite3 (2.4.1-x86_64-linux-musl)
sorbet-runtime (0.5.11708)
sqlite3 (2.5.0-aarch64-linux-gnu)
sqlite3 (2.5.0-aarch64-linux-musl)
sqlite3 (2.5.0-arm-linux-gnu)
sqlite3 (2.5.0-arm-linux-musl)
sqlite3 (2.5.0-arm64-darwin)
sqlite3 (2.5.0-x86-linux-gnu)
sqlite3 (2.5.0-x86-linux-musl)
sqlite3 (2.5.0-x86_64-darwin)
sqlite3 (2.5.0-x86_64-linux-gnu)
sqlite3 (2.5.0-x86_64-linux-musl)
sshkit (1.23.2)
base64
net-scp (>= 1.1.2)
Expand Down Expand Up @@ -399,7 +405,7 @@ GEM
timeout (0.4.3)
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
unicode-display_width (3.1.2)
unicode-display_width (3.1.3)
unicode-emoji (~> 4.0, >= 4.0.4)
unicode-emoji (4.0.4)
uri (1.0.2)
Expand Down Expand Up @@ -467,7 +473,7 @@ DEPENDENCIES
solid_cable
solid_cache
solid_queue
sqlite3 (>= 2.4.1)
sqlite3
standard
standard-rails
thruster
Expand Down

0 comments on commit 14660b5

Please sign in to comment.