1617 Commits

Author SHA1 Message Date
Nobuyoshi Nakada
c1d0b6adfc
Revert "Treat RUBY_REVISION as an integer on old rubies"
This reverts commit 6454808c52fff445ff09fefb0fb96988f82aaa3c.

It is no longer needed, as `VCS::SVN#get_revisions` now returns
`Integer` as revision numbers, and `short_revision` should deal
with it.
2019-08-28 16:51:49 +09:00
NAKAMURA Usaku
2b55df7315
revision might be an Integer 2019-08-28 15:57:30 +09:00
nagachika
ed8d2e1cfd tool/merger.rb: fix tag existence check with subversion. 2019-08-28 14:50:21 +09:00
Nobuyoshi Nakada
c9dc569a94
Ensure the last and changed revisions as Integers 2019-08-28 12:32:43 +09:00
NAKAMURA Usaku
6454808c52
Treat RUBY_REVISION as an integer on old rubies 2019-08-28 00:19:25 +09:00
Nobuyoshi Nakada
2cd68a38d9
Short revision of SVN should be an Integer 2019-08-27 23:43:41 +09:00
aycabta
978ff1ff3a Pick lib/readline.rb from ruby/reline 2019-08-27 05:24:13 +09:00
Nobuyoshi Nakada
48f1a38f23
Limit ChangeLog entries
Since the previous release date, when the starting message is not
found.
2019-08-26 18:27:17 +09:00
Nobuyoshi Nakada
c775ab5e28
local_path? is a class method [ci skip] 2019-08-25 18:27:57 +09:00
Yusuke Endoh
cc6fe15241 tool/lib/vcs.rb: explicitly fail when notes/commits is not available 2019-08-25 16:59:45 +09:00
Kazuhiro NISHIYAMA
1b03d2d76b
Revert workaround 2019-08-25 13:58:30 +09:00
Nobuyoshi Nakada
b341e98b04
Simplified f13a00f5b4 [ci skip] 2019-08-25 11:38:15 +09:00
Nobuyoshi Nakada
f13a00f5b4
Export all commits as ChangeLog when no starting commit is found [ci skip] 2019-08-25 11:24:53 +09:00
Kazuhiro NISHIYAMA
03ee12a3b8
Add workaround (2nd try)
https://rubyci.org/logs/rubyci.s3.amazonaws.com/gentoo/ruby-master/log/20190824T153002Z.fail.html.gz
```
/home/gentoo/chkbuild/tmp/build/20190824T153002Z/ruby/tool/lib/vcs.rb:577:in `export_changelog': cannot find the beginning revision of the branch (RuntimeError)
    from ./tool/make-snapshot:353:in `block in package'
    from ./tool/make-snapshot:351:in `chdir'
    from ./tool/make-snapshot:351:in `package'
    from ./tool/make-snapshot:523:in `block in <main>'
    from ./tool/make-snapshot:523:in `collect'
    from ./tool/make-snapshot:523:in `<main>'
```
2019-08-25 00:50:34 +09:00
Kazuhiro NISHIYAMA
df348310dc
Add workaround for some CIs
https://rubyci.org/logs/rubyci.s3.amazonaws.com/debian8/ruby-master/log/20190824T093005Z.fail.html.gz
```
branches:
* trunk
  remotes/origin/trunk
```
and
```
fatal: Remote branch master not found in upstream origin
```
2019-08-24 23:17:12 +09:00
Kazuhiro NISHIYAMA
97ad7862d5
Add debug print
matser branch not found on some CIs
https://rubyci.org/logs/rubyci.s3.amazonaws.com/debian9/ruby-master/log/20190824T063005Z.fail.html.gz
```
fatal: Remote branch master not found in upstream origin
```
2019-08-24 16:22:37 +09:00
Kazuhiro NISHIYAMA
fe83ed47e7
Try to fix make dist error on chkbuild
https://rubyci.org/logs/rubyci.s3.amazonaws.com/debian9/ruby-master/log/20190823T213004Z.fail.html.gz
https://rubyci.org/logs/rubyci.s3.amazonaws.com/debian8/ruby-master/log/20190824T003006Z.fail.html.gz
2019-08-24 10:20:44 +09:00
David Rodríguez
3b55394b07 Ensure all default gems have an gem folder
Even if they don't ship with any executables. This makes rbinstall
behaviour consistent with rubygems `gem install --default` command.
2019-08-23 18:20:46 +10:00
Nobuyoshi Nakada
af12172035
Removed unused literal assignments [ci skip] 2019-08-20 19:29:43 +09:00
Nobuyoshi Nakada
7a07c54bef
Subjects may contain a comma [ci skip] 2019-08-20 19:29:35 +09:00
David Rodríguez
5a384e2c08 Fix some bundler specs (#2380)
* These seem to consistenly pass already

* Show actual command when running `make test-bundler`

Current the setup command that installs the necessary gems for testing
bundler was printed, but not the actual command that runs the tests.
That was a bit confusing.

* Borrow trick from setproctitle specs

* A title that long doesn't get set sometimes

No idea why, but the test doesn't need that the title is that long.

* Fix most gem helper spec ruby-core failures

* Fix the rest of the gem helper failures

* Fix version spec by improving the assertion

* Remove unnecessary `BUNDLE_RUBY` environment var

We can use `RUBY` when necessary, and `BUNDLE_RUBY` is not a good name
because bundler considers `BUNDLE_*` variables as settings.

* Rename `BUNDLE_GEM` to `GEM_COMMAND`

This is more descriptive I think, and also friendlier for bundler
because `BUNDLE_` env variables are interpreted by bundler as settings,
and this is not a bundler setting.

This fixes one bundler spec failure in config specs against ruby-core.

* Fix quality spec when run in core

Use the proper path helper.

* Fix dummy lib builder to never load default gems

If a dummy library is named as a default gem, when requiring the library
from its executable, the default gem would be loaded when running from
core, because in core all default gems share path with bundler, and thus
they are always in the $LOAD_PATH. We fix the issue by loading lib
relatively inside dummy lib executables.

* More exact assertions

Sometimes I have the problem that I do some "print debugging" inside
specs, and suddently the spec passes. This happens when the assertion is
too relaxed, and the things I print make it match, specially when they
are simple strings like "1.0" than can be easily be part of gem paths
that I print for debugging.

I fix this by making a more exact assertion.

* Detect the correct shebang when ENV["RUBY"] is set

* Relax assertion

So that the spec passes even if another paths containing "ext" are in
the load path. This works to fix a ruby-core issue, but it's a better
assertion in general. We just want to know that the extension path was
added.

* Use folder structure independent path helper

It should fix this spec for ruby-core.

* Fix the last failing spec on ruby-core

* Skip `bundle open <default_gem>` spec when no default gems
2019-08-20 09:46:31 +09:00
NAKAMURA Usaku
4515bcc922
Omit version.h when merging 2019-08-19 15:37:28 +09:00
Hiroshi SHIBATA
51edcbad5b
Use master branch instead of trunk. 2019-08-18 18:08:59 +09:00
Hiroshi SHIBATA
9132153930
Ignore tags on default gems from ruby core repository. 2019-08-18 18:08:59 +09:00
Hiroshi SHIBATA
3ecb5125c6
Gem::ConfigMap is deprecated now 2019-08-18 13:25:31 +09:00
aycabta
0bbbe82986 Fix copy path of ruby/reline's test 2019-08-18 07:52:49 +09:00
SHIBATA Hiroshi
216d230080
Move some assertions to CoreAssertions. (#2354)
They are used by default gems like forwardable.

    * assert_raise_with_message
    * assert_warning
    * assert_warn
2019-08-14 07:44:26 +09:00
Nobuyoshi Nakada
75d9fa8b07
Detect VCS from the current directory by default [ci skip] 2019-08-13 12:24:55 +09:00
Nobuyoshi Nakada
0d1af9f942
Push commits notes too [ci skip] 2019-08-13 12:24:40 +09:00
Nobuyoshi Nakada
066a3498c6
Include commits notes in ChangeLog 2019-08-12 19:02:55 +09:00
Takashi Kokubun
b1ef14176b
We did not have tool/ before checkout
anyway we don't need authorization here.
Also retry does not seem to work in the original version, so let's
extend this with retries as a separate github action later.
2019-08-12 14:37:26 +09:00
Takashi Kokubun
4f10a61eaa
Stop relying on actions/checkout
because it randomly fails on authorization like:
https://github.com/ruby/ruby/runs/190887455
Also the backoff seems too short. Maybe we need tool/travis_retry.sh for
this too.

Cloning ruby/ruby does not need authorization. We don't need to use
actions/checkout.
2019-08-12 14:30:43 +09:00
Kazuhiro NISHIYAMA
f731cc0984
Use end_with? instead of Regexp with missing escape 2019-08-11 10:15:05 +09:00
Koichi Sasada
3cbd56d574 complement test_ prefix.
`make test-all TESTS=name` can specify running test files by name.
name can be dirname ('dir/') or a file ('.../test_foo.rb'). This
patch complement `test_` prefix for a test. So we only need to
specify `TESTS=ruby/hash` which means `TESTS=ruby/test_hash.rb`.
2019-08-09 16:08:15 +09:00
Hiroshi SHIBATA
b39efb163d
Aliases capture_output to capture_io for test-unit compatiblity. 2019-08-08 17:19:23 +09:00
Hiroshi SHIBATA
f5481e35ab
Added separator for failing commits from default gems. 2019-08-07 22:30:10 +09:00
Hiroshi SHIBATA
67cde179c5
Skip merge commit created by bundlerbot. 2019-08-07 22:29:02 +09:00
Takashi Kokubun
330e3f19c3
Refactor .travis.yml by introducing travis_retry.sh
Not using official travis_retry.bash, because it's not supporting to
modify backoff seconds.
0ad8f1886b/lib/travis/build/bash/travis_retry.bash

Not using official `travis_apt_get_update` function because it does not
propagate exit status to be used by retries.
0ad8f1886b/lib/travis/build/bash/travis_apt_get_update.bash

Co-Authored-By: Nobuyoshi Nakada <nobu@ruby-lang.org>
2019-08-07 21:47:03 +09:00
Nobuyoshi Nakada
29092d35d3
Moved FailDesc to EnvUtil.failure_description
So EnvUtil does not depends on test/unit.
2019-08-05 10:48:49 +09:00
Marcus Stollsteimer
7614cc5b24
Fix release post output for tool/format-release
Different entries should be separated by an empty line.

Closes: https://github.com/ruby/ruby/pull/2137
2019-08-04 08:58:20 +09:00
Hiroshi SHIBATA
d569d721f9
Move assert_ruby_status and assert_throw to CoreAssertions for default gems. 2019-08-03 22:17:45 +09:00
Nobuyoshi Nakada
6623cde731
Added more attributes [ci skip] 2019-08-03 14:56:07 +09:00
Nobuyoshi Nakada
4d75346187
Refine error message
Highlight failed command and suggest installing the command.
[Bug #16042]
2019-08-03 14:20:36 +09:00
Hiroshi SHIBATA
eb638b75b3
It can be share to use CoreAssertions for default gems.
ref. https://github.com/ruby/logger/pull/35
2019-08-02 21:09:43 +09:00
Koichi Sasada
cac44def0b backtrace can be nil.
Surprisingly, on SystemStackError#backtrace can return nil.
2019-07-31 15:14:50 +09:00
Koichi Sasada
efac0a2384 Revert "add debug code"
This reverts commit e83ec207cd5fda973c41d6629d8504b515522b12.
2019-07-31 15:14:50 +09:00
Koichi Sasada
e83ec207cd add debug code 2019-07-31 12:46:34 +09:00
Nobuyoshi Nakada
47144f91a1
Separate VCS::GIT#upstream 2019-07-30 16:44:29 +09:00
nagachika
73530a9619 tool/merger.rb: execute 'svn update' after 'svn ci' to update revision info on working copy. 2019-07-27 20:15:53 +09:00
Hiroshi SHIBATA
58bb7f0ca1
Skip the some of commits when sync default gems from upstream.
* Skip failed to sync commits because it needs to pick manually.
  * Skip empty commit.
2019-07-27 15:47:32 +08:00