[pull] master from ruby:master #452
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This reverts commit 155cdce.
This reverts commit af610e1. Reverted by a mistake.
It was supposed to update a local branch in case the remote branch was updated between actions/checkout and the end of tool/sync_default_gems.rb. Note that this `git pull` didn't exist in the original bin/update-default-gem.sh ruby/git.ruby-lang.org@d9e9bcc, so it was newly introduced at 3ba5cfd. But `git pull --no-ff` failed when master had updates in an unrelated repository. I think we need to use `git pull --rebase` instead. This fixes: * https://github.com/ruby/ruby/actions/runs/19207693793/job/54905403070 * checkout: f08030e * ruby tool/sync_default_gems.rb net-http ec9c70a6fba75a63c128864ef3cb32c883665a33..e4d80bd609f22cad04a2e2c1d54c981bb853c938 * pull: 2bf82c6
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
See Commits and Changes for more details.
Created by
pull[bot] (v2.0.0-alpha.4)
Can you help keep this open source service alive? 💖 Please sponsor : )