Skip to content
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
24 changes: 11 additions & 13 deletions bin/relock
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@
# bin/relock --force # delete each lock before resolving
# bin/relock -l # list every cell's lock path
#
# The committed locks are multi-platform (the PLATFORMS section spans
# linux/darwin/java); `bundle lock --update` preserves that list, so resolving
# natively on any host keeps the locks valid for CI's x86_64-linux runners.
# The committed locks are multi platform, so they include dev machine platforms and
# more importantly, ALWAYS x86_64-linux-gnu so that CI runners (Ubuntu/glibc)
# can install precompiled native gems (e.g. sqlite3) without recompiling.
#
# See --help for all options.

Expand All @@ -35,7 +35,7 @@ require_relative "lib/matrix"
include Matrix

# Shell run under the cell's Ruby. Writes the wrapper, re-resolves, adds
# checksums, and normalizes platforms where the bundler version supports them.
# checksums, and seeds x86_64-linux-gnu into PLATFORMS.
#
# When FORCE is set, the existing lock is deleted first so bundler resolves from scratch, use for edge cases.
RESOLVE = <<~SH
Expand All @@ -46,18 +46,15 @@ RESOLVE = <<~SH
echo "+ FORCE: removing $BUNDLE_GEMFILE.lock"
rm -f "$BUNDLE_GEMFILE.lock"
fi
platform_arg=""
if [ -z "${JRUBY:-}" ]; then platform_arg="--add-platform x86_64-linux-gnu"; fi
lock_help="$(bundle lock --help 2>&1)"
if echo "$lock_help" | grep -q -- --add-checksums; then
if echo "$lock_help" | grep -q -- --normalize-platforms; then
echo "+ bundle lock --update --add-checksums --normalize-platforms"
bundle lock --update --add-checksums --normalize-platforms
else
echo "+ bundle lock --update --add-checksums"
bundle lock --update --add-checksums
fi
echo "+ bundle lock --update --add-checksums $platform_arg"
bundle lock --update --add-checksums $platform_arg
else
echo "+ bundle lock --update"
bundle lock --update
echo "+ bundle lock --update $platform_arg"
bundle lock --update $platform_arg
fi
SH

Expand All @@ -67,6 +64,7 @@ def run_mise(cell, force: false)
argv = [mise_bin, "exec", "ruby@#{cell.ruby}", "--", "bash", "-c", RESOLVE]
env = cell_env(cell)
env = env.merge("FORCE" => "1") if force
env = env.merge("JRUBY" => "1") if cell.ruby.start_with?("jruby")
[env, argv]
end

Expand Down
3 changes: 1 addition & 2 deletions sentry-delayed_job/gemfiles/ruby-jruby-9.4.14.0.gemfile.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions sentry-opentelemetry/gemfiles/ruby-3.1.gemfile.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions sentry-opentelemetry/gemfiles/ruby-3.2.gemfile.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions sentry-opentelemetry/gemfiles/ruby-3.3.gemfile.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions sentry-opentelemetry/gemfiles/ruby-3.4.gemfile.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions sentry-opentelemetry/gemfiles/ruby-4.0.gemfile.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions sentry-rails/gemfiles/ruby-3.1_rails-6.1.0.gemfile.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions sentry-rails/gemfiles/ruby-3.1_rails-7.0.0.gemfile.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions sentry-rails/gemfiles/ruby-3.1_rails-7.1.0.gemfile.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions sentry-rails/gemfiles/ruby-3.1_rails-7.2.0.gemfile.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions sentry-rails/gemfiles/ruby-3.2_rails-6.1.0.gemfile.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions sentry-rails/gemfiles/ruby-3.2_rails-7.0.0.gemfile.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions sentry-rails/gemfiles/ruby-3.2_rails-7.1.0.gemfile.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions sentry-rails/gemfiles/ruby-3.2_rails-7.2.0.gemfile.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions sentry-rails/gemfiles/ruby-3.3_rails-6.1.0.gemfile.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions sentry-rails/gemfiles/ruby-3.3_rails-7.0.0.gemfile.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions sentry-rails/gemfiles/ruby-3.3_rails-7.1.0.gemfile.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions sentry-rails/gemfiles/ruby-3.3_rails-7.2.0.gemfile.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions sentry-rails/gemfiles/ruby-3.4_rails-7.1.0.gemfile.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions sentry-rails/gemfiles/ruby-3.4_rails-7.2.0.gemfile.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions sentry-rails/gemfiles/ruby-3.4_rails-8.0.0.gemfile.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions sentry-rails/gemfiles/ruby-3.4_rails-8.1.3.gemfile.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions sentry-rails/gemfiles/ruby-4.0_rails-6.1.0.gemfile.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions sentry-rails/gemfiles/ruby-4.0_rails-7.0.0.gemfile.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions sentry-rails/gemfiles/ruby-4.0_rails-7.1.0.gemfile.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions sentry-rails/gemfiles/ruby-4.0_rails-8.0.0.gemfile.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions sentry-rails/gemfiles/ruby-4.0_rails-8.1.3.gemfile.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions sentry-resque/gemfiles/ruby-jruby-9.4.14.0.gemfile.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions sentry-ruby/gemfiles/ruby-3.1_rack-2_redis-4.gemfile.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions sentry-ruby/gemfiles/ruby-3.1_rack-3_redis-4.gemfile.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions sentry-ruby/gemfiles/ruby-3.4_rack-2_redis-4.gemfile.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions sentry-ruby/gemfiles/ruby-3.4_rack-3_redis-4.gemfile.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions sentry-ruby/gemfiles/ruby-4.0_rack-2_redis-4.gemfile.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading