Commit graph

447 commits

Author SHA1 Message Date
Hiroshi SHIBATA
11ec59c92b Removed sync task for abbrev 2024-01-19 16:27:45 +09:00
Hiroshi SHIBATA
d3898e9752
Removed sync task for observer 2024-01-19 15:56:55 +09:00
Hiroshi SHIBATA
4dde4d1437 Stop sync commits from bigdecimal repo 2024-01-18 07:44:13 +09:00
Hiroshi SHIBATA
42aa24a24c No longer needed to sync base64 2024-01-17 08:28:31 +09:00
Hiroshi SHIBATA
3f5016178c We don't need to sync getoptlong 2024-01-16 17:07:10 +09:00
Hiroshi SHIBATA
c5d54e1db1
We don't need to sync mutex_m 2024-01-16 16:29:16 +09:00
KJ Tsanaktsidis
3d24254b55 Make sync script work correctly with Windows-style newlines
I'm almost certain nobody is actually running this script on Windows,
but the tests for it do run during `nmake check`, and they fail at least
on my git configuration.

The $ anchor doesn't match \r\n with git's -E regex matching, so we need
to add \r? to gobble the carriage-return up too if needed.
2023-12-27 14:11:59 +11:00
Nobuyoshi Nakada
7cbc08b388 Follow removed conflict files
After editing a conflict, continue without removed files.
2023-12-15 22:37:38 +09:00
David Rodríguez
6b3c9cebe9 Normalize bundler bindir
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-13 12:59:23 +09:00
Takashi Kokubun
fd7decbf04 Allow syncing tool/bundler 2023-12-12 11:19:02 -08:00
Hiroshi SHIBATA
440ea778f2
VERSION file of JSON is removed from upstream 2023-12-05 14:27:19 +09:00
Nobuyoshi Nakada
304194d73e Remove files which are newly added but to be ignored 2023-11-07 10:45:02 +09:00
Kevin Newton
a7a70bce82
rm prism type templates 2023-10-30 12:27:03 -04:00
Kevin Newton
3ed317a441
Remove JavaScript templates 2023-10-26 09:50:40 -04:00
Nobuyoshi Nakada
94bcae1b2a
Special treat when the first line ends with a dot [ci skip] 2023-10-04 19:27:34 +09:00
Kevin Newton
a213d21448 Move CRuby-specific prism files to top level 2023-09-28 09:44:16 -04:00
Kevin Newton
3d0a46796b Rename YARP symbols to prism 2023-09-27 13:57:38 -04:00
Kevin Newton
8ab56869a6 Rename YARP filepaths to prism filepaths 2023-09-27 13:57:38 -04:00
Kevin Newton
3cec94624b Rename compiler test to iseq test 2023-09-27 12:10:23 -04:00
Nobuyoshi Nakada
3c11cdbcfe Fix the case of file to be ignored with to be removed
The case of 7fc73ab5f6, 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-20 13:00:18 +09:00
Takashi Kokubun
5b00314868 Ignore JRuby extension sync
Avoid alerting on failing with commits like
fb97d899c5
2023-09-19 14:10:38 -07:00
Nobuyoshi Nakada
88262875fd
Fix git cat-file condition
When multiple files changed in the same directory to be removed, the
first file only was removed from changed set.
2023-09-18 02:23:59 +09:00
Nobuyoshi Nakada
2dffd36504
Move special patterns to the common pattern 2023-09-17 21:11:54 +09:00
Nobuyoshi Nakada
67dedf8cf6
Ignore changed files under removed paths
This fixes the issue commit 43ab2acf82
"Resurrect gem-specific patterns for sync" described.
2023-09-16 12:00:06 +09:00
Takashi Kokubun
43ab2acf82 Resurrect gem-specific patterns for sync
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-15 16:54:20 -07:00
Takashi Kokubun
00f263e6c4 sync_default_gems.rb: Deal with conflicts on ignored files
that do not exist in the ruby/ruby side.

This resurrects a line that had existed prior to #8329.
2023-09-01 16:17:59 -07:00
Nobuyoshi Nakada
2ce1b77ce0
sync_default_gems.rb: Discard some error messages
These messages are expected:
- `cat-file -e` at newly added entries.
- `commit --amend` when all changes removed.
2023-08-31 11:32:29 +09:00
Nobuyoshi Nakada
cbe36ef6cc
sync_default_gems.rb: Remove the pattern for yarp
Changes to `ext/yarp/extconf.rb` are detected as conflicts now, and
ignored.
2023-08-31 11:32:21 +09:00
Nobuyoshi Nakada
3d2a83b909
sync_default_gems.rb: Remove the pattern for bundler
The "bundler" directory at the top-level will be removed by more
generic rule for top-level new entries.
2023-08-31 10:54:26 +09:00
Nobuyoshi Nakada
97df09f276
sync_default_gems.rb: Refactor
- 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.
2023-08-31 10:30:36 +09:00
Nobuyoshi Nakada
dc911a47ce
sync_default_gems.rb: Move ignored_paths to ignore_file_pattern_for 2023-08-31 10:30:35 +09:00
Nobuyoshi Nakada
74f4d2683e
sync_default_gems.rb: Remove Java templates 2023-08-30 22:18:10 +09:00
Nobuyoshi Nakada
acedbcb1b4
sync_default_gems.rb: Fix typo in replace_rdoc_ref_all 2023-08-30 15:00:00 +09:00
Nobuyoshi Nakada
c05737e09f
sync_default_gems.rb: Transform by proc 2023-08-30 14:59:17 +09:00
Kevin Newton
455153705c Tests for the YARP compiler 2023-08-29 15:53:25 -04:00
Hiroshi SHIBATA
5e81127c1b
Fixed broken -a option behavior 2023-08-29 17:41:26 +09:00
Nobuyoshi Nakada
c4fc9477aa
sync_default_gems.rb: Continue if files added to the toplevel removed 2023-08-29 10:20:52 +09:00
Nobuyoshi Nakada
a6db6b150f
sync_default_gems.rb: Split sync_default_gems_with_commits 2023-08-29 09:22:28 +09:00
Jemma Issroff
3b815ed7da
Add yarp/yarp_compiler.c (#8042)
* 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.
2023-08-28 13:55:58 -07:00
Nobuyoshi Nakada
00439dbdb4
sync_default_gems.rb: convert keys of REPOSITORIES to strings
Referencing always after conversion to a symbol, and yielded gem name
is always converted to a string.
2023-08-28 17:52:50 +09:00
Takashi Kokubun
4963dd6b64 Revert racc auto-sync support
It's no longer a default gem actually.
Fixed the webhook side instead
3c27d860b4.
2023-08-28 01:14:58 -07:00
Takashi Kokubun
f5da7c379b Ignore test/regress/ for racc 2023-08-28 01:10:24 -07:00
Takashi Kokubun
94275d96a8 Add missing racc support to sync_default_gems 2023-08-28 00:50:49 -07:00
Takashi Kokubun
4221d9695d Sort repository names in sync_default_gems 2023-08-28 00:50:19 -07:00
Kevin Newton
aea7e91828 Fix sync script for YARP 2023-08-25 18:20:51 -04:00
Kevin Newton
9aba46c666
Sync YARP to c175f712522cc315f45cd2da308768b90f324dd0 2023-08-24 11:56:09 -04:00
Takashi Kokubun
544488f114 Improve comments in sync_default_gems 2023-08-23 14:22:47 -07:00
Takashi Kokubun
455297d652 Use https for remotes by default
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-23 13:56:49 -07:00
Takashi Kokubun
c6a07cc33f Ignore more files for other gems as well
e.g. bin/ for reline that was included in its last commit.
2023-08-23 13:43:47 -07:00
Takashi Kokubun
eb795b0325 Avoid sync rule duplication between YARP and others 2023-08-23 13:35:41 -07:00