Skip to content

Commit 42930fc

Browse files
tenderlovetenderlove
committed
Merge branch 'master' into update-call-data
* master: (47 commits) test/ruby/test_keywords.rb: suppress a warning test/net/http/test_https.rb (test_get_SNI_failure): stop proxy settings Support completion with case-insensitive fashion * 2019-12-10 [ci skip] Add Proc#ruby2_keywords fix typo of 54072e3 Add ipaddr optional parameter to Net::HTTP#start Added workaround for CoreAssertions used by ruby/logger. Merge the upstream changes for test-unit on ruby/logger. [ruby/logger] 1.4.1 [ruby/logger] Fixes #38 [ruby/logger] 1.4.0 [ruby/logger] Avoid creating [] and "" when logging an Exception that has no backtrace [ruby/logger] frozen_string_literal: true [ruby/logger] Fix typo Add badge of Cygwin Add cache of cygwin packages Remove unused branch name Split cygwin-chocolatey cache Remove debug print ...
2 parents 470be8d + c50d9dc commit 42930fc

38 files changed

+482
-74
lines changed

‎.github/workflows/cygwin.yml‎

Lines changed: 79 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,79 @@
1+
name: Cygwin
2+
on:
3+
push:
4+
branches:
5+
- master
6+
pull_request:
7+
branches:
8+
- '*'
9+
jobs:
10+
make:
11+
strategy:
12+
matrix:
13+
test_task: [test]
14+
os: [windows-2019]
15+
vs: [2019]
16+
fail-fast: false
17+
runs-on: ${{ matrix.os }}
18+
if: "!contains(github.event.head_commit.message, '[ci skip]')"
19+
steps:
20+
- uses: actions/cache@v1
21+
with:
22+
path: C:\Users\runneradmin\AppData\Local\Temp\chocolatey
23+
key: ${{ runner.os }}-cygwin-chocolatey-${{ matrix.os }}-${{ github.sha }}
24+
restore-keys: |
25+
${{ runner.os }}-cygwin-chocolatey-${{ matrix.os }}-
26+
${{ runner.os }}-cygwin-chocolatey-
27+
- name: Install cygwin base packages with chocolatey
28+
run: |
29+
choco install --no-progress cygwin
30+
- uses: actions/cache@v1
31+
with:
32+
path: C:\tools\cygwin\package
33+
key: ${{ runner.os }}-cygwin-package-${{ matrix.os }}-${{ github.sha }}
34+
restore-keys: |
35+
${{ runner.os }}-cygwin-package-${{ matrix.os }}-
36+
${{ runner.os }}-cygwin-package-
37+
- name: Install cygwin additional packages
38+
run: |
39+
C:\tools\cygwin\cygwinsetup.exe -qgnNdO -R C:/tools/cygwin -l C:/tools/cygwin/package -s http://mirrors.kernel.org/sourceware/cygwin/ -P autoconf,bison,gcc-core,git,libcrypt-devel,libedit-devel,libffi-devel,libgdbm-devel,libgmp-devel,libintl-devel,libncurses-devel,libreadline-devel,libssl-devel,libuuid-devel,make,patch,ruby,tcl-tk-devel,zlib-devel
40+
shell: cmd
41+
- name: Set ENV
42+
run: |
43+
echo '::set-env name=PATH::C:\tools\cygwin\bin;C:\tools\cygwin\usr\bin'
44+
# Not using official actions/checkout because it's unstable and sometimes doesn't work for a fork.
45+
- name: Checkout ruby/ruby
46+
run: |
47+
git clone --single-branch --shallow-since=yesterday https://github.com/ruby/ruby src
48+
git -C src reset --hard ${{ github.sha }}
49+
if: github.event_name == 'push'
50+
shell: cmd
51+
- name: Checkout a pull request
52+
run: |
53+
git clone --single-branch --shallow-since=yesterday --branch=${{ github.event.pull_request.head.ref }} https://github.com/${{ github.event.pull_request.head.repo.full_name }} src
54+
git -C src reset --hard ${{ github.event.pull_request.head.sha }}
55+
if: github.event_name == 'pull_request'
56+
shell: cmd
57+
- name: Actions-commit-info.sh
58+
run: |
59+
bash.exe -c "./src/tool/actions-commit-info.sh"
60+
shell: cmd
61+
- name: Autoconf
62+
run: |
63+
cd src
64+
bash.exe -c autoconf
65+
shell: cmd
66+
- name: Configure
67+
run: |
68+
md build
69+
cd build
70+
bash -c ../src/configure
71+
shell: cmd
72+
- name: make
73+
run: |
74+
make -C build
75+
shell: cmd
76+
- name: make btest
77+
run: |
78+
make -C build btest
79+
shell: cmd

‎.github/workflows/windows.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ jobs:
3636
${{ runner.os }}-chocolatey-
3737
- name: Install libraries with chocolatey
3838
run: |
39-
choco config get cacheLocation
4039
choco install --no-progress openssl winflexbison3
4140
# Not using official actions/checkout because it's unstable and sometimes doesn't work for a fork.
4241
- name: Checkout ruby/ruby

‎.travis.yml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,11 @@ env:
128128
arch: arm64
129129
<<: *gcc-8
130130

131+
- &s390x-linux
132+
name: s390x-linux
133+
arch: s390x
134+
<<: *gcc-8
135+
131136
- &jemalloc
132137
name: --with-jemalloc
133138
<<: *gcc-8
@@ -413,6 +418,7 @@ matrix:
413418
- <<: *arm64-linux
414419
- <<: *i686-linux
415420
- <<: *arm32-linux
421+
- <<: *s390x-linux
416422
- <<: *pedanticism
417423
- <<: *assertions
418424
- <<: *baseruby

‎NEWS‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -508,6 +508,11 @@ Net::FTP::
508508
* Add Net::FTP#features to check available features, and Net::FTP#option to
509509
enable/disable each of them. [Feature #15964]
510510

511+
Net::HTTP::
512+
513+
* Add ipaddr optional parameter to Net::HTTP#start to replace the address for
514+
TCP/IP connection [Feature #5180]
515+
511516
Net::IMAP::
512517

513518
* Add Server Name Indication (SNI) support. [Feature #15594]

‎README.ja.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
[![Build Status](https://travis-ci.org/ruby/ruby.svg?branch=master)](https://travis-ci.org/ruby/ruby)
22
[![Build status](https://ci.appveyor.com/api/projects/status/0sy8rrxut4o0k960/branch/master?svg=true)](https://ci.appveyor.com/project/ruby/ruby/branch/master)
3+
![](https://github.com/ruby/ruby/workflows/Cygwin/badge.svg)
34
![](https://github.com/ruby/ruby/workflows/macOS/badge.svg)
45
![](https://github.com/ruby/ruby/workflows/MJIT/badge.svg)
56
![](https://github.com/ruby/ruby/workflows/Ubuntu/badge.svg)

‎README.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
[![Build Status](https://travis-ci.org/ruby/ruby.svg?branch=master)](https://travis-ci.org/ruby/ruby)
22
[![Build status](https://ci.appveyor.com/api/projects/status/0sy8rrxut4o0k960/branch/master?svg=true)](https://ci.appveyor.com/project/ruby/ruby/branch/master)
3+
![](https://github.com/ruby/ruby/workflows/Cygwin/badge.svg)
34
![](https://github.com/ruby/ruby/workflows/macOS/badge.svg)
45
![](https://github.com/ruby/ruby/workflows/MJIT/badge.svg)
56
![](https://github.com/ruby/ruby/workflows/Ubuntu/badge.svg)

‎compile.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10494,7 +10494,7 @@ ibf_load_location_str(const struct ibf_load *load, VALUE str_index)
1049410494
static void
1049510495
ibf_load_iseq_each(struct ibf_load *load, rb_iseq_t *iseq, ibf_offset_t offset)
1049610496
{
10497-
struct rb_iseq_constant_body *load_body = iseq->body = ZALLOC(struct rb_iseq_constant_body);
10497+
struct rb_iseq_constant_body *load_body = iseq->body = rb_iseq_constant_body_alloc();
1049810498

1049910499
ibf_offset_t reading_pos = offset;
1050010500

‎iseq.c‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -431,11 +431,22 @@ rb_iseq_memsize(const rb_iseq_t *iseq)
431431
return size;
432432
}
433433

434+
static unsigned long fresh_iseq_unique_id = 0; /* -- Remove In 3.0 -- */
435+
436+
struct rb_iseq_constant_body *
437+
rb_iseq_constant_body_alloc(void)
438+
{
439+
struct rb_iseq_constant_body *iseq_body;
440+
iseq_body = ZALLOC(struct rb_iseq_constant_body);
441+
iseq_body->iseq_unique_id = fresh_iseq_unique_id++; /* -- Remove In 3.0 -- */
442+
return iseq_body;
443+
}
444+
434445
static rb_iseq_t *
435446
iseq_alloc(void)
436447
{
437448
rb_iseq_t *iseq = iseq_imemo_alloc();
438-
iseq->body = ZALLOC(struct rb_iseq_constant_body);
449+
iseq->body = rb_iseq_constant_body_alloc();
439450
return iseq;
440451
}
441452

‎iseq.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -186,6 +186,7 @@ void rb_iseq_trace_set(const rb_iseq_t *iseq, rb_event_flag_t turnon_events);
186186
void rb_iseq_trace_set_all(rb_event_flag_t turnon_events);
187187
void rb_iseq_insns_info_encode_positions(const rb_iseq_t *iseq);
188188

189+
struct rb_iseq_constant_body *rb_iseq_constant_body_alloc(void);
189190
VALUE rb_iseqw_new(const rb_iseq_t *iseq);
190191
const rb_iseq_t *rb_iseqw_to_iseq(VALUE iseqw);
191192

‎lib/irb/irb.gemspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ Gem::Specification.new do |spec|
7575
spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
7676
spec.require_paths = ["lib"]
7777

78-
spec.required_ruby_version = Gem::Requirement.new(">= 2.4")
78+
spec.required_ruby_version = Gem::Requirement.new(">= 2.5")
7979

8080
spec.add_dependency "reline", ">= 0.0.1"
8181
spec.add_development_dependency "bundler"

0 commit comments

Comments
 (0)