Skip to content

Commit

Permalink
Merge pull request #407 from Shopify/centralize-ruby
Browse files Browse the repository at this point in the history
Remove unnecessary Ruby definitions
  • Loading branch information
jenshenny authored Jul 3, 2024
2 parents 99fcfb1 + c214792 commit fec2fbf
Show file tree
Hide file tree
Showing 5 changed files with 23 additions and 22 deletions.
8 changes: 2 additions & 6 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@ jobs:
- name: Set up Ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: "3.1"
bundler-cache: true
- name: Run style checks
run: bin/rubocop
Expand All @@ -75,12 +74,9 @@ jobs:
- name: Set up Ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: "3.1"
# bundler-cache: true
bundler-cache: true
- name: Run static type checks
run: |
bundle install --jobs 4 --retry 3
bin/srb tc
run: bin/srb tc
buildall:
if: ${{ always() }}
runs-on: ubuntu-latest
Expand Down
1 change: 0 additions & 1 deletion .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ require:
- rubocop-sorbet

AllCops:
TargetRubyVersion: 3.1
NewCops: disable
UseCache: true
SuggestExtensions: false
Expand Down
33 changes: 19 additions & 14 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,8 @@ GEM
erubi (1.11.0)
i18n (1.12.0)
concurrent-ruby (~> 1.0)
json (2.6.2)
json (2.7.2)
language_server-protocol (3.17.0.3)
loofah (2.18.0)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
Expand All @@ -71,12 +72,12 @@ GEM
racc (~> 1.4)
nokogiri (1.16.4-x86_64-linux)
racc (~> 1.4)
parallel (1.24.0)
parser (3.3.1.0)
parallel (1.25.1)
parser (3.3.3.0)
ast (~> 2.4.1)
racc
prism (0.27.0)
racc (1.7.3)
racc (1.8.0)
rack (2.2.4)
rack-test (2.0.2)
rack (>= 1.3)
Expand All @@ -97,28 +98,30 @@ GEM
rbi (0.1.12)
prism (>= 0.18.0, < 0.28)
sorbet-runtime (>= 0.5.9204)
regexp_parser (2.5.0)
rexml (3.2.5)
rubocop (1.34.1)
regexp_parser (2.9.2)
rexml (3.3.0)
strscan
rubocop (1.64.1)
json (~> 2.3)
language_server-protocol (>= 3.17.0)
parallel (~> 1.10)
parser (>= 3.1.2.1)
parser (>= 3.3.0.2)
rainbow (>= 2.2.2, < 4.0)
regexp_parser (>= 1.8, < 3.0)
rexml (>= 3.2.5, < 4.0)
rubocop-ast (>= 1.20.0, < 2.0)
rubocop-ast (>= 1.31.1, < 2.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 1.4.0, < 3.0)
rubocop-ast (1.21.0)
parser (>= 3.1.1.0)
unicode-display_width (>= 2.4.0, < 3.0)
rubocop-ast (1.31.3)
parser (>= 3.3.1.0)
rubocop-performance (1.14.3)
rubocop (>= 1.7.0, < 2.0)
rubocop-ast (>= 0.4.0)
rubocop-shopify (2.9.0)
rubocop (~> 1.33)
rubocop-sorbet (0.6.11)
rubocop (>= 0.90.0)
ruby-progressbar (1.11.0)
ruby-progressbar (1.13.0)
smart_properties (1.17.0)
sorbet (0.5.11367)
sorbet-static (= 0.5.11367)
Expand All @@ -135,6 +138,7 @@ GEM
sorbet-static-and-runtime (>= 0.5.10187)
thor (>= 0.19.2)
spring (4.0.0)
strscan (3.1.0)
tapioca (0.13.3)
bundler (>= 2.2.25)
netrc (>= 0.11.0)
Expand All @@ -147,7 +151,7 @@ GEM
thor (1.3.1)
tzinfo (2.0.5)
concurrent-ruby (~> 1.0)
unicode-display_width (2.2.0)
unicode-display_width (2.5.0)
yard (0.9.36)
yard-sorbet (0.8.1)
sorbet-runtime (>= 0.5)
Expand All @@ -157,6 +161,7 @@ GEM
PLATFORMS
aarch64-linux
arm64-darwin-21
arm64-darwin-22
x86_64-darwin
x86_64-darwin-20
x86_64-linux
Expand Down
2 changes: 1 addition & 1 deletion dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: packwerk
type: ruby

up:
- ruby: 3.2.2
- ruby
- bundler

commands:
Expand Down
1 change: 1 addition & 0 deletions sorbet/config
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
--dir
.
--enable-experimental-requires-ancestor
--ignore=/vendor/bundle

0 comments on commit fec2fbf

Please sign in to comment.