summaryrefslogtreecommitdiff
path: root/tool/sync_default_gems.rb
AgeCommit message (Collapse)Author
2023-12-15Follow removed conflict filesNobuyoshi Nakada
After editing a conflict, continue without removed files.
2023-12-13Normalize bundler bindirDavid Rodríguez
This makes bundler consistent with all other gems, and makes the default installation of Bundler in the release package look like any other bundler installation. Before (on preview3, for example), Bundler executable is installed at: lib/ruby/gems/3.3.0+0/gems/bundler-2.5.0.dev/libexec/bundle Now it's installed in the standard location: lib/ruby/gems/3.3.0+0/gems/bundler-2.5.0.dev/exe/bundle
2023-12-12Allow syncing tool/bundlerTakashi Kokubun
2023-12-05VERSION file of JSON is removed from upstreamHiroshi SHIBATA
2023-11-07Remove files which are newly added but to be ignoredNobuyoshi Nakada
2023-10-30rm prism type templatesKevin Newton
2023-10-26Remove JavaScript templatesKevin Newton
2023-10-04Special treat when the first line ends with a dot [ci skip]Nobuyoshi Nakada
2023-09-28Move CRuby-specific prism files to top levelKevin Newton
2023-09-27Rename YARP symbols to prismKevin Newton
2023-09-27Rename YARP filepaths to prism filepathsKevin Newton
2023-09-27Rename compiler test to iseq testKevin Newton
2023-09-20Fix the case of file to be ignored with to be removedNobuyoshi Nakada
The case of 7fc73ab5f6fbe46655855079954b26dcc14576b3, which modified `.gitignore` and `.github/workflows/main.yml`. Both files need to be rejected and restored, but since the latter file was not there before, `git checkout` failed and the former file could not be restored along with it. To fix this failure, restore the ignored files one by one.
2023-09-19Ignore JRuby extension syncTakashi Kokubun
Avoid alerting on failing with commits like https://github.com/ruby/psych/commit/fb97d899c5a62b743159d5a3c77b0813d2cbf9b6
2023-09-18Fix `git cat-file` conditionNobuyoshi Nakada
When multiple files changed in the same directory to be removed, the first file only was removed from changed set.
2023-09-17Move special patterns to the common patternNobuyoshi Nakada
2023-09-16Ignore changed files under removed pathsNobuyoshi Nakada
This fixes the issue commit 43ab2acf8242c580b1ef5d644ea94d48669d4869 "Resurrect gem-specific patterns for sync" described.
2023-09-15Resurrect gem-specific patterns for syncTakashi Kokubun
Yet another partial revert of https://github.com/ruby/ruby/pull/8329, similar to 00f263e6c4. Repro: On ruby/ruby@1be64e34d0, `tool/sync_default_gems.rb yarp 162c2088eec6ec8f0558559e082cd661c18ee02a` should exist successfully, but it doesn't without this gem-specific handling.
2023-09-01sync_default_gems.rb: Deal with conflicts on ignored filesTakashi Kokubun
that do not exist in the ruby/ruby side. This resurrects a line that had existed prior to #8329.
2023-08-31sync_default_gems.rb: Discard some error messagesNobuyoshi Nakada
These messages are expected: - `cat-file -e` at newly added entries. - `commit --amend` when all changes removed. Notes: Merged: https://github.com/ruby/ruby/pull/8329
2023-08-31sync_default_gems.rb: Remove the pattern for yarpNobuyoshi Nakada
Changes to `ext/yarp/extconf.rb` are detected as conflicts now, and ignored. Notes: Merged: https://github.com/ruby/ruby/pull/8329
2023-08-31sync_default_gems.rb: Remove the pattern for bundlerNobuyoshi Nakada
The "bundler" directory at the top-level will be removed by more generic rule for top-level new entries. Notes: Merged: https://github.com/ruby/ruby/pull/8329
2023-08-31sync_default_gems.rb: RefactorNobuyoshi Nakada
- Filter out files to be ignored first, then resolve conflicts. - Add "added by gem" files, instead of hard-code paths to add. - Remove gem specific patterns covered by more generic rules. Notes: Merged: https://github.com/ruby/ruby/pull/8329
2023-08-31sync_default_gems.rb: Move ignored_paths to ignore_file_pattern_forNobuyoshi Nakada
Notes: Merged: https://github.com/ruby/ruby/pull/8329
2023-08-30sync_default_gems.rb: Remove Java templatesNobuyoshi Nakada
2023-08-30sync_default_gems.rb: Fix typo in replace_rdoc_ref_allNobuyoshi Nakada
2023-08-30sync_default_gems.rb: Transform by procNobuyoshi Nakada
2023-08-29Tests for the YARP compilerKevin Newton
Notes: Merged: https://github.com/ruby/ruby/pull/8323
2023-08-29Fixed broken -a option behaviorHiroshi SHIBATA
2023-08-29sync_default_gems.rb: Continue if files added to the toplevel removedNobuyoshi Nakada
2023-08-29sync_default_gems.rb: Split `sync_default_gems_with_commits`Nobuyoshi Nakada
2023-08-28Add yarp/yarp_compiler.c (#8042)Jemma Issroff
* Add yarp/yarp_compiler.c as stencil for compiling YARP This commit adds yarp/yarp_compiler.c, and changes the sync script to ensure that yarp/yarp_compiler.c will not get overwritten * [Misc #119772] Create and expose RubyVM::InstructionSequence.compile_yarp This commit creates the stencil for a compile_yarp function, which we will continue to fill out. It allows us to check the output of compiled YARP code against compiled code without using YARP. Notes: Merged-By: jemmaissroff
2023-08-28sync_default_gems.rb: convert keys of REPOSITORIES to stringsNobuyoshi Nakada
Referencing always after conversion to a symbol, and yielded gem name is always converted to a string.
2023-08-28Revert racc auto-sync supportTakashi Kokubun
It's no longer a default gem actually. Fixed the webhook side instead https://github.com/ruby/git.ruby-lang.org/commit/3c27d860b4e39d10d63280b59d4db2cec518ae13.
2023-08-28Ignore test/regress/ for raccTakashi Kokubun
2023-08-28Add missing racc support to sync_default_gemsTakashi Kokubun
2023-08-28Sort repository names in sync_default_gemsTakashi Kokubun
2023-08-25Fix sync script for YARPKevin Newton
Notes: Merged: https://github.com/ruby/ruby/pull/8298
2023-08-24Sync YARP to c175f712522cc315f45cd2da308768b90f324dd0Kevin Newton
2023-08-23Improve comments in sync_default_gemsTakashi Kokubun
2023-08-23Use https for remotes by defaultTakashi Kokubun
I was testing this script on git.ruby-lang.org to use its git version, but it did not work because the server's default user doesn't have SSH keys. https works for everyone, so it's a safer default. You shouldn't need to push to that remote from ruby/ruby anyway.
2023-08-23Ignore more files for other gems as wellTakashi Kokubun
e.g. bin/ for reline that was included in its last commit.
2023-08-23Avoid sync rule duplication between YARP and othersTakashi Kokubun
2023-08-21Place -a in the correct location [ci skip]Takashi Kokubun
It doesn't use optparse, so the location is not flexible.
2023-08-21Add a forgotten default value for ignored_pathsTakashi Kokubun
2023-08-21Skip commits that are empty after conflict resolutionTakashi Kokubun
2023-08-21Exclude docs/ from YARP syncTakashi Kokubun
2023-08-21Fix YARP syncKevin Newton
2023-08-17Attempt to recover from YARP sync failuresTakashi Kokubun
2023-08-17Attempt to explain what sync_default_gems_with_commits does [ci skip]Takashi Kokubun