Skip to content

Commit

Permalink
Merge pull request #79 from gmcgibbon/ruby_3_3rc
Browse files Browse the repository at this point in the history
Updates
  • Loading branch information
gmcgibbon authored Dec 23, 2023
2 parents 11b8bef + 5c60b63 commit 4dcf766
Show file tree
Hide file tree
Showing 43 changed files with 396 additions and 8,240 deletions.
8 changes: 1 addition & 7 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,23 +11,17 @@ jobs:
- uses: ruby/setup-ruby@v1
name: Setup Ruby
with:
ruby-version: 3.2.2
- uses: actions/setup-node@v2
name: Setup Node
with:
node-version: 16.6.1
ruby-version: 3.3.0-rc1
- name: 💅🏼 Lint
run: |
bundle install
bundle exec rubocop
- name: 🧪 Test App
run: |
bundle install
yarn install
bin/rails test
- name: 🧪 Test Blog
run: |
bundle install
yarn install
bin/rails test
working-directory: blog
5 changes: 3 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,10 @@

/public/packs
/public/packs-test
/node_modules
/yarn-error.log
yarn-debug.log*
.yarn-integrity

.rubocop-https-*
.rubocop-https-*
/app/assets/builds/*
!/app/assets/builds/.keep
1 change: 0 additions & 1 deletion .nvmrc

This file was deleted.

6 changes: 5 additions & 1 deletion .rubocop.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
inherit_from:
- https://raw.githubusercontent.com/gmcgibbon/dotfiles/main/rubocop.yml

require:
- rubocop-rails
- rubocop-capybara

AllCops:
TargetRubyVersion: 3.2.2
TargetRubyVersion: 3.3.0
Exclude:
- bin/bundle
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.2.2
3.3.0-rc1
13 changes: 8 additions & 5 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,18 @@
source "https://rubygems.org"
git_source(:github) { |repo| "https://github.com/#{repo}.git" }

ruby "3.2.2"
ruby "3.3.0rc1"

# Bundle edge Rails instead: gem 'rails', github: 'rails/rails', branch: 'main'
gem "rails", github: "rails/rails"
# Use Puma as the app server
gem "puma", "~> 5.6"
# Transpile app-like JavaScript. Read more: https://github.com/rails/webpacker
gem "webpacker", "~> 5.0"
# Turbolinks makes navigating your web application faster. Read more: https://github.com/turbolinks/turbolinks
gem "turbolinks", "~> 5"
# Use JavaScript with ESM import maps [https://github.com/rails/importmap-rails]
gem "importmap-rails"
# Hotwire's SPA-like page accelerator [https://turbo.hotwired.dev]
gem "turbo-rails"
# Hotwire's modest JavaScript framework [https://stimulus.hotwired.dev]
gem "stimulus-rails"
# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
gem "jbuilder", "~> 2.7"
# Use Redis adapter to run Action Cable in production
Expand Down Expand Up @@ -60,6 +62,7 @@ gem "blog", path: "blog"

# Code linting
gem "rubocop", require: false
gem "rubocop-capybara"
gem "rubocop-rails", require: false

gem "tailwindcss-rails"
Expand Down
Loading

0 comments on commit 4dcf766

Please sign in to comment.