Skip to content

Commit

Permalink
Merge branch 'main' into all-minor-patch
Browse files Browse the repository at this point in the history
  • Loading branch information
@xjunior
xjunior committed May 22, 2024
2 parents 77e35ea + bf28006 commit 3a59144
Show file tree
Hide file tree
Showing 22 changed files with 749 additions and 74 deletions.
8 changes: 8 additions & 0 deletions .github/workflows/dep_shield.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,13 @@ jobs:
with:
package: ${{ github.workflow }}
workdir: "packages/${{ github.workflow }}"
gemfiles: "['gemfiles/rails_6_0.gemfile','gemfiles/rails_6_1.gemfile','gemfiles/rails_7_0.gemfile','gemfiles/rails_7_1.gemfile']"
ruby: '["3.0","3.1","3.2","3.3"]'
exclude: |-
[
{ 'ruby': '3.2', 'gemfile': 'gemfiles/rails_6_0.gemfile'},
{ 'ruby': '3.3', 'gemfile': 'gemfiles/rails_6_0.gemfile'},
{ 'ruby': '3.2', 'gemfile': 'gemfiles/rails_6_1.gemfile'},
{ 'ruby': '3.3', 'gemfile': 'gemfiles/rails_6_1.gemfile'},
]
secrets: inherit
2 changes: 1 addition & 1 deletion .github/workflows/nitro_config.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@ jobs:
with:
package: ${{ github.workflow }}
workdir: "packages/${{ github.workflow }}"
gemfiles: "['gemfiles/rails_6_0.gemfile','gemfiles/rails_6_1.gemfile','gemfiles/rails_7_0.gemfile']"
gemfiles: "['gemfiles/rails_6_0.gemfile','gemfiles/rails_6_1.gemfile','gemfiles/rails_7_0.gemfile','gemfiles/rails_7_1.gemfile']"
ruby: '["3.0","3.1","3.2","3.3"]'
secrets: inherit
4 changes: 4 additions & 0 deletions packages/dep_shield/Appraisals
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,7 @@ end
appraise "rails-7-0" do
gem "rails", "7.0.8.1"
end

appraise "rails-7-1" do
gem "rails", "7.1.3.3"
end
3 changes: 2 additions & 1 deletion packages/dep_shield/Gemfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@ source "https://rubygems.org"
# Specify your gem's dependencies in dep_shield.gemspec
gemspec

gem "rails", "<= 7.1.3.2"
gem "nitro_config", path: "../nitro_config"
gem "rails", "<= 7.1.3.3"
gem "rake", "~> 13.0"
gem "rspec", "~> 3.0"
gem "rubocop-powerhome", path: "../rubocop-powerhome"
119 changes: 62 additions & 57 deletions packages/dep_shield/Gemfile.lock
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
PATH
remote: ../nitro_config
specs:
nitro_config (0.2.0)
activesupport (>= 6.0.6.1)

PATH
remote: ../rubocop-powerhome
specs:
Expand All @@ -18,71 +24,71 @@ PATH
GEM
remote: https://rubygems.org/
specs:
actioncable (7.1.3.2)
actionpack (= 7.1.3.2)
activesupport (= 7.1.3.2)
actioncable (7.1.3.3)
actionpack (= 7.1.3.3)
activesupport (= 7.1.3.3)
nio4r (~> 2.0)
websocket-driver (>= 0.6.1)
zeitwerk (~> 2.6)
actionmailbox (7.1.3.2)
actionpack (= 7.1.3.2)
activejob (= 7.1.3.2)
activerecord (= 7.1.3.2)
activestorage (= 7.1.3.2)
activesupport (= 7.1.3.2)
actionmailbox (7.1.3.3)
actionpack (= 7.1.3.3)
activejob (= 7.1.3.3)
activerecord (= 7.1.3.3)
activestorage (= 7.1.3.3)
activesupport (= 7.1.3.3)
mail (>= 2.7.1)
net-imap
net-pop
net-smtp
actionmailer (7.1.3.2)
actionpack (= 7.1.3.2)
actionview (= 7.1.3.2)
activejob (= 7.1.3.2)
activesupport (= 7.1.3.2)
actionmailer (7.1.3.3)
actionpack (= 7.1.3.3)
actionview (= 7.1.3.3)
activejob (= 7.1.3.3)
activesupport (= 7.1.3.3)
mail (~> 2.5, >= 2.5.4)
net-imap
net-pop
net-smtp
rails-dom-testing (~> 2.2)
actionpack (7.1.3.2)
actionview (= 7.1.3.2)
activesupport (= 7.1.3.2)
actionpack (7.1.3.3)
actionview (= 7.1.3.3)
activesupport (= 7.1.3.3)
nokogiri (>= 1.8.5)
racc
rack (>= 2.2.4)
rack-session (>= 1.0.1)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.2)
rails-html-sanitizer (~> 1.6)
actiontext (7.1.3.2)
actionpack (= 7.1.3.2)
activerecord (= 7.1.3.2)
activestorage (= 7.1.3.2)
activesupport (= 7.1.3.2)
actiontext (7.1.3.3)
actionpack (= 7.1.3.3)
activerecord (= 7.1.3.3)
activestorage (= 7.1.3.3)
activesupport (= 7.1.3.3)
globalid (>= 0.6.0)
nokogiri (>= 1.8.5)
actionview (7.1.3.2)
activesupport (= 7.1.3.2)
actionview (7.1.3.3)
activesupport (= 7.1.3.3)
builder (~> 3.1)
erubi (~> 1.11)
rails-dom-testing (~> 2.2)
rails-html-sanitizer (~> 1.6)
activejob (7.1.3.2)
activesupport (= 7.1.3.2)
activejob (7.1.3.3)
activesupport (= 7.1.3.3)
globalid (>= 0.3.6)
activemodel (7.1.3.2)
activesupport (= 7.1.3.2)
activerecord (7.1.3.2)
activemodel (= 7.1.3.2)
activesupport (= 7.1.3.2)
activemodel (7.1.3.3)
activesupport (= 7.1.3.3)
activerecord (7.1.3.3)
activemodel (= 7.1.3.3)
activesupport (= 7.1.3.3)
timeout (>= 0.4.0)
activestorage (7.1.3.2)
actionpack (= 7.1.3.2)
activejob (= 7.1.3.2)
activerecord (= 7.1.3.2)
activesupport (= 7.1.3.2)
activestorage (7.1.3.3)
actionpack (= 7.1.3.3)
activejob (= 7.1.3.3)
activerecord (= 7.1.3.3)
activesupport (= 7.1.3.3)
marcel (~> 1.0)
activesupport (7.1.3.2)
activesupport (7.1.3.3)
base64
bigdecimal
concurrent-ruby (~> 1.0, >= 1.0.2)
Expand Down Expand Up @@ -140,7 +146,7 @@ GEM
marcel (1.0.4)
mini_mime (1.1.5)
mini_portile2 (2.8.6)
minitest (5.23.0)
minitest (5.23.1)
mutex_m (0.2.0)
net-imap (0.4.11)
date
Expand All @@ -152,8 +158,6 @@ GEM
net-smtp (0.5.0)
net-protocol
nio4r (2.7.3)
nitro_config (0.2.0)
activesupport (>= 5.2.8.1)
nokogiri (1.16.5)
mini_portile2 (~> 2.8.2)
racc (~> 1.4)
Expand All @@ -174,30 +178,30 @@ GEM
rackup (2.1.0)
rack (>= 3)
webrick (~> 1.8)
rails (7.1.3.2)
actioncable (= 7.1.3.2)
actionmailbox (= 7.1.3.2)
actionmailer (= 7.1.3.2)
actionpack (= 7.1.3.2)
actiontext (= 7.1.3.2)
actionview (= 7.1.3.2)
activejob (= 7.1.3.2)
activemodel (= 7.1.3.2)
activerecord (= 7.1.3.2)
activestorage (= 7.1.3.2)
activesupport (= 7.1.3.2)
rails (7.1.3.3)
actioncable (= 7.1.3.3)
actionmailbox (= 7.1.3.3)
actionmailer (= 7.1.3.3)
actionpack (= 7.1.3.3)
actiontext (= 7.1.3.3)
actionview (= 7.1.3.3)
activejob (= 7.1.3.3)
activemodel (= 7.1.3.3)
activerecord (= 7.1.3.3)
activestorage (= 7.1.3.3)
activesupport (= 7.1.3.3)
bundler (>= 1.15.0)
railties (= 7.1.3.2)
railties (= 7.1.3.3)
rails-dom-testing (2.2.0)
activesupport (>= 5.0.0)
minitest
nokogiri (>= 1.6)
rails-html-sanitizer (1.6.0)
loofah (~> 2.21)
nokogiri (~> 1.14)
railties (7.1.3.2)
actionpack (= 7.1.3.2)
activesupport (= 7.1.3.2)
railties (7.1.3.3)
actionpack (= 7.1.3.3)
activesupport (= 7.1.3.3)
irb
rackup (>= 1.0.0)
rake (>= 12.2)
Expand Down Expand Up @@ -292,7 +296,8 @@ DEPENDENCIES
combustion (~> 1.4)
dep_shield!
license_finder (>= 7.0)
rails (<= 7.1.3.2)
nitro_config!
rails (<= 7.1.3.3)
rake (~> 13.0)
rspec (~> 3.0)
rubocop-powerhome!
Expand Down
1 change: 1 addition & 0 deletions packages/dep_shield/gemfiles/rails_6_0.gemfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

source "https://rubygems.org"

gem "nitro_config", path: "../../nitro_config"
gem "rails", "6.0.6.1"
gem "rake", "~> 13.0"
gem "rspec", "~> 3.0"
Expand Down
11 changes: 8 additions & 3 deletions packages/dep_shield/gemfiles/rails_6_0.gemfile.lock
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
PATH
remote: ../../nitro_config
specs:
nitro_config (0.2.0)
activesupport (>= 6.0.6.1)

PATH
remote: ../../rubocop-powerhome
specs:
Expand Down Expand Up @@ -115,7 +121,7 @@ GEM
method_source (1.1.0)
mini_mime (1.1.5)
mini_portile2 (2.8.6)
minitest (5.23.0)
minitest (5.23.1)
net-imap (0.4.11)
date
net-protocol
Expand All @@ -126,8 +132,6 @@ GEM
net-smtp (0.5.0)
net-protocol
nio4r (2.7.3)
nitro_config (0.2.0)
activesupport (>= 5.2.8.1)
nokogiri (1.16.5)
mini_portile2 (~> 2.8.2)
racc (~> 1.4)
Expand Down Expand Up @@ -264,6 +268,7 @@ DEPENDENCIES
combustion (~> 1.4)
dep_shield!
license_finder (>= 7.0)
nitro_config!
rails (= 6.0.6.1)
rake (~> 13.0)
rspec (~> 3.0)
Expand Down
1 change: 1 addition & 0 deletions packages/dep_shield/gemfiles/rails_6_1.gemfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

source "https://rubygems.org"

gem "nitro_config", path: "../../nitro_config"
gem "rails", "6.1.7.7"
gem "rake", "~> 13.0"
gem "rspec", "~> 3.0"
Expand Down
11 changes: 8 additions & 3 deletions packages/dep_shield/gemfiles/rails_6_1.gemfile.lock
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
PATH
remote: ../../nitro_config
specs:
nitro_config (0.2.0)
activesupport (>= 6.0.6.1)

PATH
remote: ../../rubocop-powerhome
specs:
Expand Down Expand Up @@ -119,7 +125,7 @@ GEM
method_source (1.1.0)
mini_mime (1.1.5)
mini_portile2 (2.8.6)
minitest (5.23.0)
minitest (5.23.1)
net-imap (0.4.11)
date
net-protocol
Expand All @@ -130,8 +136,6 @@ GEM
net-smtp (0.5.0)
net-protocol
nio4r (2.7.3)
nitro_config (0.2.0)
activesupport (>= 5.2.8.1)
nokogiri (1.16.5)
mini_portile2 (~> 2.8.2)
racc (~> 1.4)
Expand Down Expand Up @@ -267,6 +271,7 @@ DEPENDENCIES
combustion (~> 1.4)
dep_shield!
license_finder (>= 7.0)
nitro_config!
rails (= 6.1.7.7)
rake (~> 13.0)
rspec (~> 3.0)
Expand Down
1 change: 1 addition & 0 deletions packages/dep_shield/gemfiles/rails_7_0.gemfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

source "https://rubygems.org"

gem "nitro_config", path: "../../nitro_config"
gem "rails", "7.0.8.1"
gem "rake", "~> 13.0"
gem "rspec", "~> 3.0"
Expand Down
11 changes: 8 additions & 3 deletions packages/dep_shield/gemfiles/rails_7_0.gemfile.lock
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
PATH
remote: ../../nitro_config
specs:
nitro_config (0.2.0)
activesupport (>= 6.0.6.1)

PATH
remote: ../../rubocop-powerhome
specs:
Expand Down Expand Up @@ -125,7 +131,7 @@ GEM
method_source (1.1.0)
mini_mime (1.1.5)
mini_portile2 (2.8.6)
minitest (5.23.0)
minitest (5.23.1)
net-imap (0.4.11)
date
net-protocol
Expand All @@ -136,8 +142,6 @@ GEM
net-smtp (0.5.0)
net-protocol
nio4r (2.7.3)
nitro_config (0.2.0)
activesupport (>= 5.2.8.1)
nokogiri (1.16.5)
mini_portile2 (~> 2.8.2)
racc (~> 1.4)
Expand Down Expand Up @@ -266,6 +270,7 @@ DEPENDENCIES
combustion (~> 1.4)
dep_shield!
license_finder (>= 7.0)
nitro_config!
rails (= 7.0.8.1)
rake (~> 13.0)
rspec (~> 3.0)
Expand Down
13 changes: 13 additions & 0 deletions packages/dep_shield/gemfiles/rails_7_1.gemfile
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# frozen_string_literal: true

# This file was generated by Appraisal

source "https://rubygems.org"

gem "nitro_config", path: "../../nitro_config"
gem "rails", "7.1.3.3"
gem "rake", "~> 13.0"
gem "rspec", "~> 3.0"
gem "rubocop-powerhome", path: "../../rubocop-powerhome"

gemspec path: "../"
Loading

0 comments on commit 3a59144

Please sign in to comment.