Skip to content

Commit 1dea9e4

Browse files
committed
Merge remote-tracking branch 'upstream/master' into Ractor-Local-GC-version-3
2 parents 71ae4ff + 687bd83 commit 1dea9e4

Some content is hidden

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

78 files changed

+5098
-1746
lines changed

.github/workflows/bundled_gems.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ jobs:
104104
timeout-minutes: 30
105105
env:
106106
RUBY_TESTOPTS: '-q --tty=no'
107-
TEST_BUNDLED_GEMS_ALLOW_FAILURES: 'typeprof'
107+
TEST_BUNDLED_GEMS_ALLOW_FAILURES: 'typeprof,rbs,repl_type_completor'
108108
if: ${{ steps.diff.outputs.gems }}
109109

110110
- name: Commit

.github/workflows/codeql-analysis.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ jobs:
5050
5151
env:
5252
enable_install_doc: no
53+
CODEQL_ACTION_CLEANUP_TRAP_CACHES: true
5354

5455
strategy:
5556
fail-fast: false

.github/workflows/macos.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ jobs:
143143
timeout-minutes: 60
144144
env:
145145
RUBY_TESTOPTS: '-q --tty=no'
146-
TEST_BUNDLED_GEMS_ALLOW_FAILURES: 'typeprof'
146+
TEST_BUNDLED_GEMS_ALLOW_FAILURES: 'typeprof,rbs,repl_type_completor'
147147
PRECHECK_BUNDLED_GEMS: 'no'
148148

149149
- name: make skipped tests

.github/workflows/modgc.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ jobs:
154154
timeout-minutes: ${{ matrix.gc.timeout || 40 }}
155155
env:
156156
RUBY_TESTOPTS: '-q --tty=no'
157-
TEST_BUNDLED_GEMS_ALLOW_FAILURES: 'typeprof'
157+
TEST_BUNDLED_GEMS_ALLOW_FAILURES: 'typeprof,rbs,repl_type_completor'
158158
PRECHECK_BUNDLED_GEMS: 'no'
159159

160160
- name: make skipped tests

.github/workflows/parsey.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ jobs:
8282
EXCLUDES: '../src/test/.excludes-parsey'
8383
RUN_OPTS: ${{ matrix.run_opts || '--parser=parse.y' }}
8484
SPECOPTS: ${{ matrix.specopts || '-T --parser=parse.y' }}
85-
TEST_BUNDLED_GEMS_ALLOW_FAILURES: 'typeprof'
85+
TEST_BUNDLED_GEMS_ALLOW_FAILURES: 'typeprof,rbs,repl_type_completor'
8686

8787
- uses: ./.github/actions/slack
8888
with:

.github/workflows/ubuntu.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ jobs:
130130
timeout-minutes: ${{ matrix.timeout || 40 }}
131131
env:
132132
RUBY_TESTOPTS: '-q --tty=no'
133-
TEST_BUNDLED_GEMS_ALLOW_FAILURES: 'typeprof'
133+
TEST_BUNDLED_GEMS_ALLOW_FAILURES: 'typeprof,rbs,repl_type_completor'
134134
PRECHECK_BUNDLED_GEMS: 'no'
135135

136136
- name: make skipped tests

.github/workflows/windows.yml

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -88,13 +88,6 @@ jobs:
8888
scoop install vcpkg uutils-coreutils cmake@3.31.6
8989
shell: pwsh
9090

91-
- name: Export GitHub Actions cache environment variables
92-
uses: actions/github-script@v7
93-
with:
94-
script: |
95-
core.exportVariable('ACTIONS_CACHE_URL', process.env.ACTIONS_CACHE_URL || '');
96-
core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || '');
97-
9891
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
9992
with:
10093
sparse-checkout-cone-mode: false
@@ -140,12 +133,17 @@ jobs:
140133
run: Get-Volume
141134
shell: pwsh
142135

136+
# vcpkg built-in cache is not working now
137+
- name: Restore vcpkg artifact
138+
uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
139+
with:
140+
path: C:\Users\runneradmin\AppData\Local\vcpkg\archives
141+
key: windows-${{ matrix.os }}-vcpkg-${{ hashFiles('src/vcpkg.json') }}
142+
143143
- name: Install libraries with vcpkg
144144
run: |
145-
vcpkg install
145+
vcpkg install --vcpkg-root=C:\Users\runneradmin\scoop\apps\vcpkg\current
146146
working-directory: src
147-
env:
148-
VCPKG_BINARY_SOURCES: "clear;x-gha,readwrite"
149147

150148
# TODO: We should use `../src` instead of `D:/a/ruby/ruby/src`
151149
- name: Configure

.github/workflows/yjit-macos.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ jobs:
147147
timeout-minutes: 60
148148
env:
149149
RUBY_TESTOPTS: '-q --tty=no'
150-
TEST_BUNDLED_GEMS_ALLOW_FAILURES: 'typeprof'
150+
TEST_BUNDLED_GEMS_ALLOW_FAILURES: 'typeprof,rbs,repl_type_completor'
151151
SYNTAX_SUGGEST_TIMEOUT: '5'
152152
PRECHECK_BUNDLED_GEMS: 'no'
153153
continue-on-error: ${{ matrix.continue-on-test_task || false }}

.github/workflows/yjit-ubuntu.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ jobs:
195195
timeout-minutes: 90
196196
env:
197197
RUBY_TESTOPTS: '-q --tty=no'
198-
TEST_BUNDLED_GEMS_ALLOW_FAILURES: 'typeprof'
198+
TEST_BUNDLED_GEMS_ALLOW_FAILURES: 'typeprof,rbs,repl_type_completor'
199199
PRECHECK_BUNDLED_GEMS: 'no'
200200
SYNTAX_SUGGEST_TIMEOUT: '5'
201201
YJIT_BINDGEN_DIFF_OPTS: '--exit-code'

NEWS.md

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,11 @@ Note: We're only listing outstanding class updates.
2525
* `IO.select` accepts +Float::INFINITY+ as a timeout argument.
2626
[[Feature #20610]]
2727

28+
* Set
29+
30+
* Set is now a core class, instead of an autoloaded stdlib class.
31+
[[Feature #21216]]
32+
2833
* String
2934

3035
* Update Unicode to Version 16.0.0 and Emoji Version 16.0. [[Feature #19908]][[Feature #20724]]
@@ -43,7 +48,7 @@ The following bundled gems are promoted from default gems.
4348
* irb 1.15.2
4449
* reline 0.6.1
4550
* readline 0.0.4
46-
* fiddle 1.1.6
51+
* fiddle 1.1.8
4752

4853
We only list stdlib changes that are notable feature changes.
4954

@@ -58,7 +63,7 @@ The following default gems are updated.
5863
* RubyGems 3.7.0.dev
5964
* bundler 2.7.0.dev
6065
* cgi 0.4.2
61-
* json 2.10.2
66+
* json 2.11.2
6267
* optparse 0.7.0.dev.2
6368
* prism 1.4.0
6469
* psych 5.2.3
@@ -98,3 +103,4 @@ The following bundled gems are updated.
98103
[Feature #20724]: https://bugs.ruby-lang.org/issues/20724
99104
[Feature #21047]: https://bugs.ruby-lang.org/issues/21047
100105
[Bug #21049]: https://bugs.ruby-lang.org/issues/21049
106+
[Feature #21216]: https://bugs.ruby-lang.org/issues/21216

0 commit comments

Comments
 (0)