Skip to content

Commit 3da9d12

Browse files
author
Kadir Selçuk
authored
Merge pull request #81 from ruby/master
[pull] master from ruby:master
2 parents c2e0e7d + a1a4d77 commit 3da9d12

File tree

2,282 files changed

+89491
-49067
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

2,282 files changed

+89491
-49067
lines changed

.appveyor.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ skip_commits:
2020
- '**/*.[1-8]'
2121
- '**/*.ronn'
2222
environment:
23-
ruby_version: "24-%Platform%"
23+
ruby_version: "25-%Platform%"
2424
matrix:
2525
# Test only the oldest supported version because AppVeyor is unstable, its concurrency
2626
# is limited, and compatibility issues that happen only in newer versions are rare.
@@ -75,6 +75,7 @@ for:
7575
- attrib +r /s /d
7676
- mkdir %Platform%-mswin_%vs%
7777
build_script:
78+
- set HAVE_GIT=no
7879
- cd %APPVEYOR_BUILD_FOLDER%
7980
- cd %Platform%-mswin_%vs%
8081
- >-

.cirrus.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ yjit_task:
8989
matrix:
9090
- CC: clang-12
9191
configure: --enable-yjit=dev
92-
rustup_init: --default-toolchain=1.58.1
92+
rustup_init: --default-toolchain=1.58.0
9393
- CC: gcc-11
9494
configure: --enable-yjit
9595
id_script: id
@@ -129,5 +129,6 @@ yjit_task:
129129
full_build_script: source $HOME/.cargo/env && make
130130
cargo_test_script: source $HOME/.cargo/env && cd yjit && cargo test
131131
make_test_script: source $HOME/.cargo/env && make test RUN_OPTS="--yjit-call-threshold=1 --yjit-verify-ctx"
132-
make_test_all_script: source $HOME/.cargo/env && make test-all RUN_OPTS="--yjit-call-threshold=1" TESTOPTS="$RUBY_TESTOPTS"
133-
make_test_spec_script: source $HOME/.cargo/env && make test-spec RUN_OPTS="--yjit-call-threshold=1"
132+
make_test_all_script: source $HOME/.cargo/env && make test-all RUN_OPTS="--yjit-call-threshold=1 --yjit-verify-ctx" TESTOPTS="$RUBY_TESTOPTS"
133+
make_test_spec_script: source $HOME/.cargo/env && make test-spec RUN_OPTS="--yjit-call-threshold=1 --yjit-verify-ctx"
134+
clippy_script: source $HOME/.cargo/env && cd yjit && cargo clippy --all-targets --all-features

.document

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,18 @@ gc.rb
1818
io.rb
1919
kernel.rb
2020
marshal.rb
21+
rjit.rb
2122
numeric.rb
2223
nilclass.rb
2324
pack.rb
2425
ractor.rb
2526
string.rb
27+
symbol.rb
2628
timev.rb
2729
thread_sync.rb
2830
trace_point.rb
2931
warning.rb
32+
yjit.rb
3033

3134
# the lib/ directory (which has its own .document file)
3235
lib

.gdbinit

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1281,7 +1281,7 @@ end
12811281

12821282
# Details: https://bugs.ruby-lang.org/projects/ruby-master/wiki/MachineInstructionsTraceWithGDB
12831283
define trace_machine_instructions
1284-
set logging on
1284+
set logging enabled
12851285
set height 0
12861286
set width 0
12871287
display/i $pc

.git-blame-ignore-revs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
# Expand tabs
77
5b21e94bebed90180d8ff63dad03b8b948361089
8+
c5e9af9c9d890578182a21e7b71b50334cd5579e
89

910
# Enable Style/StringLiterals cop for RubyGems/Bundler
1011
d7ffd3fea402239b16833cc434404a7af82d44f3

.github/auto_request_review.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,14 @@
11
files:
22
'yjit*': [team:yjit]
33
'yjit/**/*': [team:yjit]
4+
'yjit/src/cruby_bindings.inc.rs': []
45
'doc/yjit/*': [team:yjit]
56
'bootstraptest/test_yjit*': [team:yjit]
67
'test/ruby/test_yjit*': [team:yjit]
78
'.github/workflows/yjit*': [team:yjit]
89
options:
910
ignore_draft: true
11+
# This currently doesn't work as intended. We want to skip reviews when only
12+
# cruby_bingings.inc.rs is modified, but this skips reviews even when other
13+
# yjit files are modified as well. To be enabled after fixing the behavior.
14+
#last_files_match_only: true

.github/codeql/codeql-config.yml

Lines changed: 0 additions & 3 deletions
This file was deleted.

.github/dependabot.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,4 @@ updates:
33
- package-ecosystem: 'github-actions'
44
directory: '/'
55
schedule:
6-
interval: 'weekly'
7-
ignore:
8-
# It doesn't update the version comment for us
9-
- dependency-name: 'necojackarc/auto-request-review'
6+
interval: 'daily'

.github/workflows/annocheck.yml

Lines changed: 160 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,160 @@
1+
name: Annocheck
2+
3+
on:
4+
push:
5+
paths-ignore:
6+
- 'doc/**'
7+
- '**/man'
8+
- '**.md'
9+
- '**.rdoc'
10+
- '**/.document'
11+
pull_request:
12+
paths-ignore:
13+
- 'doc/**'
14+
- '**/man'
15+
- '**.rdoc'
16+
- '**/.document'
17+
merge_group:
18+
paths-ignore:
19+
- 'doc/**'
20+
- '**/man'
21+
- '**.rdoc'
22+
- '**/.document'
23+
24+
concurrency:
25+
group: ${{ github.workflow }} / ${{ startsWith(github.event_name, 'pull') && github.ref_name || github.sha }}
26+
cancel-in-progress: ${{ startsWith(github.event_name, 'pull') }}
27+
28+
# GitHub actions does not support YAML anchors. This creative use of
29+
# environment variables (plus the "echo $GITHUB_ENV" hack) is to reroute that
30+
# restriction.
31+
env:
32+
default_cc: clang-15
33+
append_cc: ''
34+
35+
# -O1 is faster than -O3 in our tests... Majority of time are consumed trying
36+
# to optimize binaries. Also GitHub Actions run on relatively modern CPUs
37+
# compared to, say, GCC 4 or Clang 3. We don't specify `-march=native`
38+
# because compilers tend not understand what the CPU is.
39+
optflags: '-O1'
40+
41+
# -g0 disables backtraces when SEGV. Do not set that.
42+
debugflags: '-ggdb3'
43+
44+
default_configure: >-
45+
--enable-debug-env
46+
--disable-install-doc
47+
--with-ext=-test-/cxxanyargs,+
48+
append_configure: >-
49+
--without-valgrind
50+
--without-jemalloc
51+
--without-gmp
52+
53+
CONFIGURE_TTY: never
54+
GITPULLOPTIONS: --no-tags origin ${{github.ref}}
55+
RUBY_DEBUG: ci rgengc
56+
RUBY_TESTOPTS: >-
57+
-q
58+
--color=always
59+
--tty=no
60+
61+
permissions:
62+
contents: read
63+
64+
jobs:
65+
compile:
66+
strategy:
67+
fail-fast: false
68+
matrix:
69+
env:
70+
- {}
71+
entry:
72+
- name: 'gcc-11 annocheck'
73+
container: gcc-11
74+
env:
75+
# Minimal flags to pass the check.
76+
default_cc: 'gcc-11 -fcf-protection -Wa,--generate-missing-build-notes=yes'
77+
optflags: '-O2'
78+
LDFLAGS: '-Wl,-z,now'
79+
# FIXME: Drop skipping options
80+
# https://bugs.ruby-lang.org/issues/18061
81+
# https://sourceware.org/annobin/annobin.html/Test-pie.html
82+
TEST_ANNOCHECK_OPTS: "--skip-pie --skip-gaps"
83+
check: true
84+
85+
name: ${{ matrix.entry.name }}
86+
runs-on: ubuntu-latest
87+
container:
88+
image: ghcr.io/ruby/ruby-ci-image:${{ matrix.entry.container || matrix.entry.env.default_cc || 'clang-15' }}
89+
options: --user root
90+
if: ${{ !contains(github.event.head_commit.message, '[DOC]') && !contains(github.event.pull_request.labels.*.name, 'Documentation') }}
91+
env: ${{ matrix.entry.env || matrix.env }}
92+
steps:
93+
- run: id
94+
working-directory:
95+
- run: mkdir build
96+
working-directory:
97+
- name: setenv
98+
run: |
99+
echo "GNUMAKEFLAGS=-sj$((1 + $(nproc --all)))" >> $GITHUB_ENV
100+
- uses: actions/checkout@8f4b7f84864484a7bf31766abe9204da3cbe65b3 # v3.5.0
101+
with:
102+
path: src
103+
- uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1
104+
with:
105+
path: src/.downloaded-cache
106+
key: downloaded-cache
107+
- name: autogen
108+
run: |
109+
if [ ! -f ./autogen.sh ]; then
110+
ls -la
111+
fi
112+
./autogen.sh
113+
working-directory: src
114+
- name: Run configure
115+
run: >
116+
../src/configure -C ${default_configure} ${append_configure}
117+
--${{
118+
matrix.entry.crosshost && 'host' || 'with-gcc'
119+
}}=${{
120+
matrix.entry.crosshost || '"${default_cc}${append_cc:+ $append_cc}"'
121+
}}
122+
--${{ matrix.entry.shared || 'enable' }}-shared
123+
- run: make extract-extlibs
124+
- run: make incs
125+
- run: make showflags
126+
- run: make
127+
- run: make leaked-globals
128+
- run: make test
129+
- run: make install
130+
if: ${{ matrix.entry.check }}
131+
- run: make test-tool
132+
if: ${{ matrix.entry.check }}
133+
### test-all doesn't work: https://github.com/ruby/ruby/actions/runs/4340112185/jobs/7578344307
134+
# - run: make test-all TESTS='-- ruby -ext-'
135+
# if: ${{ matrix.entry.check }}
136+
### test-spec doesn't work: https://github.com/ruby/ruby/actions/runs/4340193212/jobs/7578505652
137+
# - run: make test-spec
138+
# env:
139+
# CHECK_LEAKS: true
140+
# if: ${{ matrix.entry.check }}
141+
- run: make test-annocheck
142+
if: ${{ matrix.entry.check && endsWith(matrix.entry.name, 'annocheck') }}
143+
144+
- uses: ruby/action-slack@0bd85c72233cdbb6a0fe01d37aaeff1d21b5fce1 # v3.2.1
145+
with:
146+
payload: |
147+
{
148+
"ci": "GitHub Actions",
149+
"env": "${{ github.workflow }} / ${{ matrix.entry.name }}",
150+
"url": "https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}",
151+
"commit": "${{ github.sha }}",
152+
"branch": "${{ github.ref_name }}"
153+
}
154+
env:
155+
SLACK_WEBHOOK_URL: ${{ secrets.SIMPLER_ALERTS_URL }} # ruby-lang slack: ruby/simpler-alerts-bot
156+
if: ${{ failure() && github.event_name == 'push' }}
157+
158+
defaults:
159+
run:
160+
working-directory: build

.github/workflows/auto_request_review.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,18 @@ name: Auto Request Review
22
on:
33
pull_request_target:
44
types: [opened, ready_for_review, reopened]
5+
6+
permissions:
7+
contents: read
8+
59
jobs:
610
auto-request-review:
711
name: Auto Request Review
812
runs-on: ubuntu-latest
13+
if: ${{ github.repository == 'ruby/ruby' }}
914
steps:
1015
- name: Request review based on files changes and/or groups the author belongs to
11-
uses: necojackarc/auto-request-review@b5e81876454003a4ccb9b89cb205c67d77d7035b # v0.8.0, checking sha
16+
uses: necojackarc/auto-request-review@5f91f424cabb3211c669e49e79da8363f7df395b # v0.10.0
1217
with:
1318
# scope: public_repo
1419
token: ${{ secrets.MATZBOT_GITHUB_TOKEN }}

0 commit comments

Comments
 (0)