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.

Sign up for GitHub

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

Remove cityhash from Gemfile #2155

Merged
merged 1 commit into from
Jan 27, 2025
Merged

Remove cityhash from Gemfile #2155

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 0 additions & 4 deletions Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,6 @@ group :development, :test do
gem "state_machines"
gem "activerecord-typedstore"
gem "identity_cache"
gem "cityhash",
git: "https://github.com/csfrancis/cityhash.git",
ref: "3cfc7d01f333c01811d5e834f1495eaa29f87c36",
require: false
gem "activeresource"
gem "google-protobuf"
gem "graphql"
Expand Down
27 changes: 19 additions & 8 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,3 @@
GIT
remote: https://github.com/csfrancis/cityhash.git
revision: 3cfc7d01f333c01811d5e834f1495eaa29f87c36
ref: 3cfc7d01f333c01811d5e834f1495eaa29f87c36
specs:
cityhash (0.6.0)

PATH
remote: .
specs:
Expand Down Expand Up @@ -150,6 +143,9 @@ GEM
activemodel
globalid (1.2.1)
activesupport (>= 6.1)
google-protobuf (4.29.3-aarch64-linux)
bigdecimal
rake (>= 13)
google-protobuf (4.29.3-arm64-darwin)
bigdecimal
rake (>= 13)
Expand Down Expand Up @@ -220,12 +216,18 @@ GEM
net-protocol
netrc (0.11.0)
nio4r (2.7.4)
nokogiri (1.18.2-aarch64-linux-gnu)
racc (~> 1.4)
nokogiri (1.18.2-aarch64-linux-musl)
racc (~> 1.4)
nokogiri (1.18.2-arm64-darwin)
racc (~> 1.4)
nokogiri (1.18.2-x86_64-darwin)
racc (~> 1.4)
nokogiri (1.18.2-x86_64-linux-gnu)
racc (~> 1.4)
nokogiri (1.18.2-x86_64-linux-musl)
racc (~> 1.4)
ostruct (0.6.0)
parallel (1.26.3)
parser (3.3.7.0)
Expand Down Expand Up @@ -328,6 +330,7 @@ GEM
sorbet (0.5.11766)
sorbet-static (= 0.5.11766)
sorbet-runtime (0.5.11766)
sorbet-static (0.5.11766-aarch64-linux)
sorbet-static (0.5.11766-universal-darwin)
sorbet-static (0.5.11766-x86_64-linux)
sorbet-static-and-runtime (0.5.11766)
Expand All @@ -341,9 +344,12 @@ GEM
sprockets (4.2.1)
concurrent-ruby (~> 1.0)
rack (>= 2.2.4, < 4)
sqlite3 (2.5.0-aarch64-linux-gnu)
sqlite3 (2.5.0-aarch64-linux-musl)
sqlite3 (2.5.0-arm64-darwin)
sqlite3 (2.5.0-x86_64-darwin)
sqlite3 (2.5.0-x86_64-linux-gnu)
sqlite3 (2.5.0-x86_64-linux-musl)
state_machines (0.6.0)
stringio (3.1.2)
thor (1.3.2)
Expand Down Expand Up @@ -371,16 +377,21 @@ GEM
zlib (3.1.0)

PLATFORMS
aarch64-linux
aarch64-linux-gnu
aarch64-linux-musl
arm64-darwin
universal-darwin
x86_64-darwin
x86_64-linux
x86_64-linux-gnu
x86_64-linux-musl

Comment on lines +380 to +388
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldn't all of this just be?

PLATFORMS
  aarch64-linux
  universal-darwin
  x86_64-linux

Copy link
Contributor Author

@andyw8 andyw8 Jan 21, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Bundler 2.6 output a message advising running --normalize-platforms:

https://bundler.io/blog/2024/12/19/bundler-v2-6.html

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure, I get that, but universal-darwin already includes arm64-darwin and x86_64-darwin, and similarly x86_64-linux is a superset of x86_64-linux-{gnu,musl}. So we should not need the finer grained ones.

DEPENDENCIES
aasm
activerecord-typedstore
activeresource
bcrypt
cityhash!
config
debug
frozen_record
Expand Down
36 changes: 0 additions & 36 deletions sorbet/rbi/gems/[email protected]
View file
Open in desktop

This file was deleted.

Loading