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

Bump actions/dependency-review-action from 3 to 4 #50

Merged
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 .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "Ruby",
"image": "mcr.microsoft.com/devcontainers/ruby:3.2",
"image": "mcr.microsoft.com/devcontainers/ruby:3",
"postCreateCommand": ["bundle"],
"customizations": {
"vscode": {
Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
- name: Setup Ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: 2.7
ruby-version: 3.3
- name: Bundle
run: |
gem uninstall bundler
Expand All @@ -23,11 +23,12 @@ jobs:
strategy:
matrix:
ruby:
- "2.7"
- "3.0"
- "3.1"
- "3.2"
- "3.3"
rails:
- "7.1"
- "7.0"
- "6.1"
steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/dependency-review.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@ jobs:
- name: 'Checkout Repository'
uses: actions/checkout@v4
- name: 'Dependency Review'
uses: actions/dependency-review-action@v3
uses: actions/dependency-review-action@v4
2 changes: 1 addition & 1 deletion .github/workflows/gempush.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
- name: Set up Ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: 2.7
ruby-version: 3.3

- name: Publish to RubyGems
run: |
Expand Down
3 changes: 1 addition & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
.bundle/
log/*.log
pkg/
test/dummy/db/*.sqlite3
test/dummy/db/*.sqlite3-journal
test/dummy/db/*.sqlite3*
test/dummy/log/*.log
test/dummy/tmp/
test/dummy/.sass-cache
Expand Down
3 changes: 1 addition & 2 deletions .prettierrc
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
{
"trailingComma": "all",
"rubyToProc": true
"trailingComma": "all"
}
2 changes: 1 addition & 1 deletion .rubocop.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
AllCops:
TargetRubyVersion: "2.5"
TargetRubyVersion: "3.3"
Metrics/LineLength:
Max: 120
Style/Documentation:
Expand Down
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ rails = case rails_version
when 'main'
{ github: 'rails/rails' }
when 'default'
'~> 7.0'
'~> 7.1'
else
"~> #{rails_version}"
end
Expand Down
2 changes: 1 addition & 1 deletion test/dummy/db/schema.rb
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
#
# It's strongly recommended that you check this file into your version control system.

ActiveRecord::Schema[7.0].define(version: 2016_03_26_174530) do
ActiveRecord::Schema[7.1].define(version: 2016_03_26_174530) do
create_table "categories", force: :cascade do |t|
t.string "name"
t.integer "store_id"
Expand Down
2 changes: 1 addition & 1 deletion test/filter_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ class FilterTest < ActiveSupport::TestCase
test "allows filtering based on the beverage when multiple beverages are configured and only one of them has a filter" do
mock = Minitest::Mock.new
store = stores(:supermarket)
category = categories(:baseball)
_category = categories(:baseball)

# filter method specific to one model
# store.ball? doesn't exist
Expand Down
9 changes: 7 additions & 2 deletions test/test_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,19 @@
# Load support files
Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }

# Load fixtures from the engine
if ActiveSupport::TestCase.respond_to?(:fixture_path=)
ActiveSupport::TestCase.fixture_path =
File.expand_path("../fixtures", __FILE__)
ActionDispatch::IntegrationTest.fixture_path =
ActiveSupport::TestCase.fixture_path
ActiveSupport::TestCase.fixtures :all
elsif ActiveSupport::TestCase.respond_to?(:fixture_paths=)
ActiveSupport::TestCase.fixture_paths = [
File.expand_path("../fixtures", __FILE__),
]
ActionDispatch::IntegrationTest.fixture_paths =
ActiveSupport::TestCase.fixture_paths
end
ActiveSupport::TestCase.fixtures :all

ActiveJob::Base.queue_adapter = :inline
ActiveSupport.test_order = :random
Expand Down
2 changes: 1 addition & 1 deletion thermos.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ Gem::Specification.new do |s|
s.files = Dir['{app,config,db,lib}/**/*', 'MIT-LICENSE', 'Rakefile', 'README.rdoc']
s.test_files = Dir['test/**/*']

s.required_ruby_version = ['>= 2.7.0', '< 3.3.0']
s.required_ruby_version = ['~> 3.0']

s.add_runtime_dependency 'rails'
s.add_development_dependency 'rake'
Expand Down