Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into Ractor-Local-GC-v…
Browse files Browse the repository at this point in the history
…ersion-3
  • Loading branch information
rm155 committed Sep 4, 2024
2 parents ff7063d + 294dad2 commit c86c3b8
Show file tree
Hide file tree
Showing 137 changed files with 2,078 additions and 812 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -77,15 +77,15 @@ jobs:
run: sudo rm /usr/lib/ruby/vendor_ruby/rubygems/defaults/operating_system.rb

- name: Initialize CodeQL
uses: github/codeql-action/init@2c779ab0d087cd7fe7b826087247c2c81f27bfa6 # v3.26.5
uses: github/codeql-action/init@4dd16135b69a43b6c8efb853346f8437d92d3c93 # v3.26.6
with:
languages: ${{ matrix.language }}

- name: Autobuild
uses: github/codeql-action/autobuild@2c779ab0d087cd7fe7b826087247c2c81f27bfa6 # v3.26.5
uses: github/codeql-action/autobuild@4dd16135b69a43b6c8efb853346f8437d92d3c93 # v3.26.6

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@2c779ab0d087cd7fe7b826087247c2c81f27bfa6 # v3.26.5
uses: github/codeql-action/analyze@4dd16135b69a43b6c8efb853346f8437d92d3c93 # v3.26.6
with:
category: '/language:${{ matrix.language }}'
upload: False
Expand Down Expand Up @@ -115,7 +115,7 @@ jobs:
continue-on-error: true

- name: Upload SARIF
uses: github/codeql-action/upload-sarif@2c779ab0d087cd7fe7b826087247c2c81f27bfa6 # v3.26.5
uses: github/codeql-action/upload-sarif@4dd16135b69a43b6c8efb853346f8437d92d3c93 # v3.26.6
with:
sarif_file: sarif-results/${{ matrix.language }}.sarif
continue-on-error: true
8 changes: 8 additions & 0 deletions .github/workflows/macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,14 @@ jobs:
sudo sysctl -w kern.coredump=1
sudo chmod -R +rwx /cores/
- name: Delete unused SDKs
# To free up disk space to not run out during the run
run: |
sudo rm -rf ~/.dotnet
sudo rm -rf /Library/Android
sudo rm -rf /Library/Developer/CoreSimulator
continue-on-error: true

- name: Run configure
run: ../src/configure -C --disable-install-doc ${ruby_configure_args}

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ jobs:
-H "Accept: application/vnd.github+json" \
-H "X-GitHub-Api-Version: 2022-11-28" \
https://api.github.com/repos/rbenv/ruby-build/dispatches \
-d '{"event_type": "update-ruby"}'
-d '{"event_type": "update-ruby", "client_payload": {"ruby_version": "${{ env.RUBY_VERSION }}", "openssl_version": "3.0.15"}}'
- name: Update all-ruby definition
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/scorecards.yml
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,6 @@ jobs:

# Upload the results to GitHub's code scanning dashboard.
- name: 'Upload to code-scanning'
uses: github/codeql-action/upload-sarif@2c779ab0d087cd7fe7b826087247c2c81f27bfa6 # v3.26.5
uses: github/codeql-action/upload-sarif@4dd16135b69a43b6c8efb853346f8437d92d3c93 # v3.26.6
with:
sarif_file: results.sarif
2 changes: 2 additions & 0 deletions .github/workflows/ubuntu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,8 @@ jobs:
- test_task: test-bundled-gems
- test_task: check
os: ubuntu-20.04
- test_task: check
os: ubuntu-24.04
fail-fast: false

env:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/wasm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ jobs:
- run: tar cfz ../install.tar.gz -C ../install .

- name: Upload artifacts
uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a # v4.3.6
uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0
with:
name: ruby-wasm-install
path: ${{ github.workspace }}/install.tar.gz
Expand Down Expand Up @@ -164,7 +164,7 @@ jobs:
- name: Save Pull Request number
if: ${{ github.event_name == 'pull_request' }}
run: echo "${{ github.event.pull_request.number }}" >> ${{ github.workspace }}/github-pr-info.txt
- uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a # v4.3.6
- uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0
if: ${{ github.event_name == 'pull_request' }}
with:
name: github-pr-info
Expand Down
9 changes: 2 additions & 7 deletions .github/workflows/windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,8 @@ on:
- '**/.document'
- '.*.yml'
pull_request:
paths-ignore:
- 'doc/**'
- '**/man/*'
- '**.md'
- '**.rdoc'
- '**/.document'
- '.*.yml'
# Do not use paths-ignore for required status checks
# https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/collaborating-on-repositories-with-code-quality-features/troubleshooting-required-status-checks#handling-skipped-but-required-checks
merge_group:

concurrency:
Expand Down
153 changes: 0 additions & 153 deletions .travis.yml

This file was deleted.

11 changes: 7 additions & 4 deletions NEWS.md
Original file line number Diff line number Diff line change
Expand Up @@ -71,25 +71,28 @@ The following default gems are updated.
* RubyGems 3.6.0.dev
* bundler 2.6.0.dev
* erb 4.0.4
* fiddle 1.1.3
* fiddle 1.1.3.dev
* io-console 0.7.2
* irb 1.14.0
* json 2.7.2
* logger 1.6.1
* net-http 0.4.1
* optparse 0.5.0
* prism 1.0.0
* rdoc 6.7.0
* reline 0.5.9
* resolv 0.4.0
* stringio 3.1.2
* strscan 3.1.1
* stringio 3.1.2.dev
* strscan 3.1.1.dev
* uri 0.13.1
* zlib 3.1.1
The following bundled gems are updated.
* minitest 5.25.1
* rake 13.2.1
* test-unit 3.6.2
* rexml 3.3.6
* rexml 3.3.7
* rss 0.3.1
* net-ftp 0.3.7
* net-imap 0.4.15
Expand Down
4 changes: 2 additions & 2 deletions array.c
Original file line number Diff line number Diff line change
Expand Up @@ -1884,6 +1884,7 @@ static VALUE rb_ary_aref2(VALUE ary, VALUE b, VALUE e);
* # Raises TypeError (no implicit conversion of Symbol into Integer):
* a[:foo]
*
* Related: see {Methods for Fetching}[rdoc-ref:Array@Methods+for+Fetching].
*/

VALUE
Expand Down Expand Up @@ -8582,7 +8583,7 @@ rb_ary_deconstruct(VALUE ary)
*
* These methods do not modify +self+.
*
* - #[]: Returns one or more elements.
* - #[], #slice: Returns consecutive elements as determined by a given argument.
* - #fetch: Returns the element at a given offset.
* - #first: Returns one or more leading elements.
* - #last: Returns one or more trailing elements.
Expand All @@ -8604,7 +8605,6 @@ rb_ary_deconstruct(VALUE ary)
* - #take: Returns leading elements as determined by a given index.
* - #drop_while: Returns trailing elements as determined by a given block.
* - #take_while: Returns leading elements as determined by a given block.
* - #slice: Returns consecutive elements as determined by a given argument.
* - #sort: Returns all elements in an order determined by <tt><=></tt> or a given block.
* - #reverse: Returns all elements in reverse order.
* - #compact: Returns an array containing all non-+nil+ elements.
Expand Down
12 changes: 12 additions & 0 deletions ast.c
Original file line number Diff line number Diff line change
Expand Up @@ -775,12 +775,24 @@ node_locations(VALUE ast_value, const NODE *node)
{
enum node_type type = nd_type(node);
switch (type) {
case NODE_ALIAS:
return rb_ary_new_from_args(2,
location_new(nd_code_loc(node)),
location_new(&RNODE_ALIAS(node)->keyword_loc));
case NODE_UNDEF:
return rb_ary_new_from_args(2,
location_new(nd_code_loc(node)),
location_new(&RNODE_UNDEF(node)->keyword_loc));
case NODE_UNLESS:
return rb_ary_new_from_args(4,
location_new(nd_code_loc(node)),
location_new(&RNODE_UNLESS(node)->keyword_loc),
location_new(&RNODE_UNLESS(node)->then_keyword_loc),
location_new(&RNODE_UNLESS(node)->end_keyword_loc));
case NODE_VALIAS:
return rb_ary_new_from_args(2,
location_new(nd_code_loc(node)),
location_new(&RNODE_VALIAS(node)->keyword_loc));
case NODE_ARGS_AUX:
case NODE_LAST:
break;
Expand Down
7 changes: 7 additions & 0 deletions benchmark/time_strftime.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
prelude: |
# frozen_string_literal: true
time = Time.now
benchmark:
- time.strftime("%FT%T") # 19B
- time.strftime("%FT%T.%3N") # 23B
- time.strftime("%FT%T.%6N") # 26B
4 changes: 0 additions & 4 deletions doc/rdoc/markup_reference.rb
Original file line number Diff line number Diff line change
Expand Up @@ -918,10 +918,6 @@
#
# - Linked: <tt>https://github.com</tt> links to https://github.com.
#
# [Protocol +www+]
#
# - Linked: <tt>www.yahoo.com</tt> links to www.yahoo.com.
#
# [Protocol +ftp+]
#
# - Linked: <tt>ftp://nosuch.site</tt> links to ftp://nosuch.site.
Expand Down
Loading

0 comments on commit c86c3b8

Please sign in to comment.