Skip to content

Commit b96430a

Browse files
wkswks
committed
Merge branch 'master' into mmtk
2 parents 68a6bbf + 83966a5 commit b96430a

File tree

1,090 files changed

+25954
-73961
lines changed

Some content is hidden

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

1,090 files changed

+25954
-73961
lines changed

Diff for: ‎.document

+3
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,9 @@ trace_point.rb
3131
warning.rb
3232
yjit.rb
3333

34+
# Errno::*
35+
known_errors.inc
36+
3437
# the lib/ directory (which has its own .document file)
3538
lib
3639

Diff for: ‎.github/actions/setup/directories/action.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ runs:
8080
with:
8181
path: ${{ inputs.srcdir }}
8282

83-
- uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1
83+
- uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # v4.0.0
8484
with:
8585
path: ${{ inputs.srcdir }}/.downloaded-cache
8686
key: downloaded-cache

Diff for: ‎.github/dependabot.yml

+13-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,18 @@
11
version: 2
22
updates:
33
- package-ecosystem: 'github-actions'
4-
directory: '/.github'
4+
directory: '/'
5+
schedule:
6+
interval: 'daily'
7+
- package-ecosystem: 'github-actions'
8+
directory: '/.github/actions/slack'
9+
schedule:
10+
interval: 'daily'
11+
- package-ecosystem: 'github-actions'
12+
directory: '/.github/actions/setup/directories'
13+
schedule:
14+
interval: 'daily'
15+
- package-ecosystem: 'cargo'
16+
directory: '/yjit'
517
schedule:
618
interval: 'daily'

Diff for: ‎.github/workflows/annocheck.yml

-2
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,6 @@ jobs:
111111

112112
### test-spec doesn't work: https://github.com/ruby/ruby/actions/runs/4340193212/jobs/7578505652
113113
# - run: make test-spec
114-
# env:
115-
# CHECK_LEAKS: true
116114

117115
- run: make test-annocheck
118116

Diff for: ‎.github/workflows/baseruby.yml

+2-4
Original file line numberDiff line numberDiff line change
@@ -50,16 +50,14 @@ jobs:
5050
strategy:
5151
matrix:
5252
ruby:
53-
- ruby-2.5
54-
# - ruby-2.6
55-
# - ruby-2.7
53+
- ruby-2.7
5654
- ruby-3.0
5755
- ruby-3.1
5856
- ruby-3.2
5957
- ruby-3.3
6058

6159
steps:
62-
- uses: ruby/setup-ruby@036ef458ddccddb148a2b9fb67e95a22fdbf728b # v1.160.0
60+
- uses: ruby/setup-ruby@5daca165445f0ae10478593083f72ca2625e241d # v1.169.0
6361
with:
6462
ruby-version: ${{ matrix.ruby }}
6563
bundler: none

Diff for: ‎.github/workflows/check_misc.yml

-8
Original file line numberDiff line numberDiff line change
@@ -52,14 +52,6 @@ jobs:
5252
exit $fail
5353
working-directory: include
5454

55-
# This should be able to be removed once old platforms are dropped.
56-
- id: c99-check
57-
name: Check for C99 features which may not be supported
58-
run: |
59-
# VC2013: z modifier for size_t is not supported.
60-
grep -r -n --include='*.[chyS]' '%[0-9]*z[idu]' -- . && exit 1 || :
61-
continue-on-error: true # Just show in the annotations
62-
6355
- id: gems
6456
run: true
6557
if: ${{ github.ref == 'refs/heads/master' }}

Diff for: ‎.github/workflows/compilers.yml

-2
Original file line numberDiff line numberDiff line change
@@ -278,8 +278,6 @@ jobs:
278278
if: ${{ matrix.entry.check }}
279279

280280
- run: make test-spec
281-
env:
282-
CHECK_LEAKS: true
283281
if: ${{ matrix.entry.check }}
284282

285283
- run: make test-annocheck

Diff for: ‎.github/workflows/dependabot_automerge.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
id: metadata
1616

1717
- name: Wait for status checks
18-
uses: lewagon/wait-on-check-action@e106e5c43e8ca1edea6383a39a01c5ca495fd812 # v1.3.1
18+
uses: lewagon/wait-on-check-action@595dabb3acf442d47e29c9ec9ba44db0c6bdd18f # v1.3.3
1919
with:
2020
repo-token: ${{ secrets.MATZBOT_GITHUB_TOKEN }}
2121
ref: ${{ github.event.pull_request.head.sha || github.sha }}

Diff for: ‎.github/workflows/macos.yml

+5-3
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,12 @@ jobs:
3333
matrix:
3434
test_task: ['check']
3535
configure: ['']
36-
os: ${{ fromJSON(format('["macos-11","macos-12"{0}]', (github.repository == 'ruby/ruby' && ',"macos-arm-oss"' || ''))) }}
36+
os: ${{ fromJSON(format('["macos-12","macos-13"{0}]', (github.repository == 'ruby/ruby' && ',"macos-arm-oss"' || ''))) }}
3737
include:
3838
- test_task: test-all TESTS=--repeat-count=2
39-
os: ${{ github.repository == 'ruby/ruby' && 'macos-arm-oss' || 'macos-12' }}
39+
os: ${{ github.repository == 'ruby/ruby' && 'macos-arm-oss' || 'macos-13' }}
40+
- test_task: test-bundled-gems
41+
os: ${{ github.repository == 'ruby/ruby' && 'macos-arm-oss' || 'macos-13' }}
4042
fail-fast: false
4143

4244
env:
@@ -83,7 +85,7 @@ jobs:
8385
env:
8486
RUBY_TESTOPTS: '-q --tty=no'
8587
TESTS: ${{ matrix.test_task == 'check' && matrix.skipped_tests || '' }}
86-
TEST_BUNDLED_GEMS_ALLOW_FAILURES: ''
88+
TEST_BUNDLED_GEMS_ALLOW_FAILURES: 'typeprof'
8789
PRECHECK_BUNDLED_GEMS: 'no'
8890

8991
- name: make skipped tests

Diff for: ‎.github/workflows/mingw.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ jobs:
5959
include:
6060
# To mitigate flakiness of MinGW CI, we test only one runtime that newer MSYS2 uses.
6161
- msystem: 'UCRT64'
62-
base_ruby: head
62+
baseruby: '2.7'
6363
test_task: 'check'
6464
test-all-opts: '--name=!/TestObjSpace#test_reachable_objects_during_iteration/'
6565
fail-fast: false
@@ -74,9 +74,9 @@ jobs:
7474
7575
steps:
7676
- name: Set up Ruby & MSYS2
77-
uses: ruby/setup-ruby@036ef458ddccddb148a2b9fb67e95a22fdbf728b # v1.160.0
77+
uses: ruby/setup-ruby@5daca165445f0ae10478593083f72ca2625e241d # v1.169.0
7878
with:
79-
ruby-version: ${{ matrix.base_ruby }}
79+
ruby-version: ${{ matrix.baseruby }}
8080

8181
- name: where check
8282
run: |

Diff for: ‎.github/workflows/prism.yml

+130
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,130 @@
1+
name: Prism
2+
on:
3+
push:
4+
paths-ignore:
5+
- 'doc/**'
6+
- '**.md'
7+
- '**.rdoc'
8+
- '**/.document'
9+
- '**.[1-8]'
10+
- '**.ronn'
11+
- '.*.yml'
12+
pull_request:
13+
paths-ignore:
14+
- 'doc/**'
15+
- '**.md'
16+
- '**.rdoc'
17+
- '**/.document'
18+
- '**.[1-8]'
19+
- '**.ronn'
20+
- '.*.yml'
21+
merge_group:
22+
paths-ignore:
23+
- 'doc/**'
24+
- '**.md'
25+
- '**.rdoc'
26+
- '**/.document'
27+
- '**.[1-8]'
28+
- '**.ronn'
29+
- '.*.yml'
30+
31+
concurrency:
32+
group: ${{ github.workflow }} / ${{ startsWith(github.event_name, 'pull') && github.ref_name || github.sha }}
33+
cancel-in-progress: ${{ startsWith(github.event_name, 'pull') }}
34+
35+
permissions:
36+
contents: read
37+
38+
jobs:
39+
make:
40+
strategy:
41+
matrix:
42+
# main variables included in the job name
43+
test_task: [check]
44+
run_opts: ['--parser=prism']
45+
arch: ['']
46+
fail-fast: false
47+
48+
env:
49+
GITPULLOPTIONS: --no-tags origin ${{ github.ref }}
50+
RUBY_DEBUG: ci
51+
SETARCH: ${{ matrix.arch && format('setarch {0}', matrix.arch) }}
52+
53+
runs-on: ubuntu-22.04
54+
55+
if: >-
56+
${{!(false
57+
|| contains(github.event.head_commit.message, '[DOC]')
58+
|| contains(github.event.pull_request.title, '[DOC]')
59+
|| contains(github.event.pull_request.labels.*.name, 'Documentation')
60+
|| (github.event_name == 'push' && github.actor == 'dependabot[bot]')
61+
)}}
62+
63+
steps:
64+
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
65+
with:
66+
sparse-checkout-cone-mode: false
67+
sparse-checkout: /.github
68+
69+
- uses: ./.github/actions/setup/ubuntu
70+
71+
- uses: ./.github/actions/setup/directories
72+
with:
73+
srcdir: src
74+
builddir: build
75+
makeup: true
76+
77+
- name: Run configure
78+
env:
79+
arch: ${{ matrix.arch }}
80+
run: >-
81+
$SETARCH ../src/configure -C --disable-install-doc cppflags=-DRUBY_DEBUG
82+
${arch:+--target=$arch-$OSTYPE --host=$arch-$OSTYPE}
83+
84+
- run: $SETARCH make
85+
86+
- name: make btest
87+
run: |
88+
make -s btest RUN_OPTS="$RUN_OPTS"
89+
timeout-minutes: 30
90+
env:
91+
GNUMAKEFLAGS: ''
92+
RUBY_TESTOPTS: '-v --tty=no'
93+
RUN_OPTS: ${{ matrix.run_opts }}
94+
continue-on-error: true
95+
96+
# - name: make test
97+
# run: |
98+
# $SETARCH make -s test RUN_OPTS="$RUN_OPTS"
99+
# timeout-minutes: 30
100+
# env:
101+
# GNUMAKEFLAGS: ''
102+
# RUBY_TESTOPTS: '-v --tty=no'
103+
# RUN_OPTS: ${{ matrix.run_opts }}
104+
105+
# - name: make test-all
106+
# run: |
107+
# $SETARCH make -s test-all RUN_OPTS="$RUN_OPTS"
108+
# timeout-minutes: 40
109+
# env:
110+
# GNUMAKEFLAGS: ''
111+
# RUBY_TESTOPTS: '-q --tty=no'
112+
# RUN_OPTS: ${{ matrix.run_opts }}
113+
114+
# - name: make test-spec
115+
# run: |
116+
# $SETARCH make -s test-spec RUN_OPTS="$RUN_OPTS"
117+
# timeout-minutes: 10
118+
# env:
119+
# GNUMAKEFLAGS: ''
120+
# RUN_OPTS: ${{ matrix.run_opts }}
121+
122+
- uses: ./.github/actions/slack
123+
with:
124+
label: ${{ matrix.run_opts }}
125+
SLACK_WEBHOOK_URL: ${{ secrets.SIMPLER_ALERTS_URL }} # ruby-lang slack: ruby/simpler-alerts-bot
126+
if: ${{ failure() }}
127+
128+
defaults:
129+
run:
130+
working-directory: build

Diff for: ‎.github/workflows/rjit-bindgen.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ jobs:
5252
5353
steps:
5454
- name: Set up Ruby
55-
uses: ruby/setup-ruby@036ef458ddccddb148a2b9fb67e95a22fdbf728b # v1.160.0
55+
uses: ruby/setup-ruby@5daca165445f0ae10478593083f72ca2625e241d # v1.169.0
5656
with:
5757
ruby-version: '3.1'
5858

Diff for: ‎.github/workflows/spec_guards.yml

+1-3
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ jobs:
4848
steps:
4949
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
5050

51-
- uses: ruby/setup-ruby@036ef458ddccddb148a2b9fb67e95a22fdbf728b # v1.160.0
51+
- uses: ruby/setup-ruby@5daca165445f0ae10478593083f72ca2625e241d # v1.169.0
5252
with:
5353
ruby-version: ${{ matrix.ruby }}
5454
bundler: none
@@ -57,8 +57,6 @@ jobs:
5757

5858
- run: ruby ../mspec/bin/mspec
5959
working-directory: spec/ruby
60-
env:
61-
CHECK_LEAKS: true
6260

6361
- uses: ./.github/actions/slack
6462
with:

Diff for: ‎.github/workflows/ubuntu.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ jobs:
9999
env:
100100
RUBY_TESTOPTS: '-q --tty=no'
101101
TESTS: ${{ matrix.test_task == 'check' && matrix.skipped_tests || '' }}
102-
TEST_BUNDLED_GEMS_ALLOW_FAILURES: ''
102+
TEST_BUNDLED_GEMS_ALLOW_FAILURES: 'typeprof'
103103
PRECHECK_BUNDLED_GEMS: 'no'
104104

105105
- name: make skipped tests

Diff for: ‎.github/workflows/wasm.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ jobs:
136136
- run: tar cfz ../install.tar.gz -C ../install .
137137

138138
- name: Upload artifacts
139-
uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3
139+
uses: actions/upload-artifact@26f96dfa697d77e81fd5907df203aa23a56210a8 # v4.3.0
140140
with:
141141
name: ruby-wasm-install
142142
path: ${{ github.workspace }}/install.tar.gz
@@ -164,7 +164,7 @@ jobs:
164164
- name: Save Pull Request number
165165
if: ${{ github.event_name == 'pull_request' }}
166166
run: echo "${{ github.event.pull_request.number }}" >> ${{ github.workspace }}/github-pr-info.txt
167-
- uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3
167+
- uses: actions/upload-artifact@26f96dfa697d77e81fd5907df203aa23a56210a8 # v4.3.0
168168
if: ${{ github.event_name == 'pull_request' }}
169169
with:
170170
name: github-pr-info

Diff for: ‎.github/workflows/windows.yml

+12-2
Original file line numberDiff line numberDiff line change
@@ -96,15 +96,21 @@ jobs:
9696
${{ steps.find-tools.outputs.needs }}
9797
if: ${{ steps.find-tools.outputs.needs != '' }}
9898

99-
- uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3.3.2
99+
- uses: ruby/setup-ruby@5daca165445f0ae10478593083f72ca2625e241d # v1.169.0
100+
with:
101+
ruby-version: '2.7'
102+
bundler: none
103+
windows-toolchain: none
104+
105+
- uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # v4.0.0
100106
with:
101107
path: C:\vcpkg\downloads
102108
key: ${{ runner.os }}-vcpkg-download-${{ env.OS_VER }}-${{ github.sha }}
103109
restore-keys: |
104110
${{ runner.os }}-vcpkg-download-${{ env.OS_VER }}-
105111
${{ runner.os }}-vcpkg-download-
106112
107-
- uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3.3.2
113+
- uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # v4.0.0
108114
with:
109115
path: C:\vcpkg\installed
110116
key: ${{ runner.os }}-vcpkg-installed-${{ env.OS_VER }}-${{ github.sha }}
@@ -133,6 +139,7 @@ jobs:
133139
builddir: build
134140

135141
- name: setup env
142+
# Available Ruby versions: https://github.com/actions/runner-images/blob/main/images/windows/Windows2019-Readme.md#ruby
136143
# %TEMP% is inconsistent with %TMP% and test-all expects they are consistent.
137144
# https://github.com/actions/virtual-environments/issues/712#issuecomment-613004302
138145
run: |
@@ -150,6 +157,9 @@ jobs:
150157
C:\msys64\usr\bin\comm -13 old.env new.env >> %GITHUB_ENV%
151158
del *.env
152159
160+
- name: baseruby version
161+
run: ruby -v
162+
153163
- name: compiler version
154164
run: cl
155165

Diff for: ‎.github/workflows/yjit-macos.yml

+1
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,7 @@ jobs:
119119
TESTS: ${{ matrix.test_task == 'check' && matrix.skipped_tests || '' }}
120120
TEST_BUNDLED_GEMS_ALLOW_FAILURES: ''
121121
PRECHECK_BUNDLED_GEMS: 'no'
122+
continue-on-error: ${{ matrix.continue-on-test_task || false }}
122123

123124
- name: make skipped tests
124125
run: |

0 commit comments

Comments
 (0)