Skip to content

ci(relock): Normalize platforms #2995

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

Merged
sl0thentr0py merged 1 commit into from
Jun 29, 2026
Merged

ci(relock): Normalize platforms #2995

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
19 changes: 11 additions & 8 deletions bin/relock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ require "optparse"
require_relative "lib/matrix"
include Matrix
Comment thread
sl0thentr0py marked this conversation as resolved.

# Shell run under the cell's Ruby. Writes the wrapper, re-resolves, and adds
# checksums where the bundler version supports them.
# Shell run under the cell's Ruby. Writes the wrapper, re-resolves, adds
# checksums, and normalizes platforms where the bundler version supports them.
#
# When FORCE is set, the existing lock is deleted first so bundler resolves from scratch, use for edge cases.
RESOLVE = <<~SH
Expand All @@ -46,12 +46,15 @@ RESOLVE = <<~SH
echo "+ FORCE: removing $BUNDLE_GEMFILE.lock"
rm -f "$BUNDLE_GEMFILE.lock"
fi
# --add-checksums needs Bundler >= 2.5; fold it into the update where
# supported, and fall back to a plain update on older Rubies so they don't
# surface a flag-not-found error.
if bundle lock --help 2>&1 | grep -q -- --add-checksums; then
echo "+ bundle lock --update --add-checksums"
bundle lock --update --add-checksums
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
else
echo "+ bundle lock --update"
bundle lock --update
Expand Down
Loading