diff options
| author | Takashi Kokubun <takashikkbn@gmail.com> | 2025-11-09 09:54:41 -0800 |
|---|---|---|
| committer | Takashi Kokubun <takashikkbn@gmail.com> | 2025-11-09 10:01:56 -0800 |
| commit | 17efb770c89029f6b7df639b673a9a8cc08c8d0d (patch) | |
| tree | 1cd214f480a57469c36964eee9503696026aa5d7 /include/ruby/encoding.h | |
| parent | f1b1899a749b28ce5c951034efeb096d15ae244c (diff) | |
sync_default_gems.yml: Pull --rebase before push
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
https://github.com/ruby/git.ruby-lang.org/commit/d9e9bcc60dcf0dd1cbdc2dd42bc0286439e471aa,
so it was newly introduced at https://github.com/ruby/ruby/commit/3ba5cfd1cb77b61b2b1ad1d03271bc1fe7b71969.
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: f08030e9dccf38d9ea5c9505203fe26484dc28d8
* ruby tool/sync_default_gems.rb net-http ec9c70a6fba75a63c128864ef3cb32c883665a33..e4d80bd609f22cad04a2e2c1d54c981bb853c938
* pull: 2bf82c627494e785737037bbaf9a6b98f3c6354c
Diffstat (limited to 'include/ruby/encoding.h')
0 files changed, 0 insertions, 0 deletions