Skip to content

Commit

Permalink
Merge branch 'master' into dev/mmtk-overrides-default
Browse files Browse the repository at this point in the history
  • Loading branch information
wks committed Oct 23, 2024
2 parents 9036b4e + 19747c1 commit d6d6255
Show file tree
Hide file tree
Showing 258 changed files with 5,679 additions and 2,672 deletions.
8 changes: 0 additions & 8 deletions .github/actions/compilers/entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -70,14 +70,6 @@ fi

pushd ${builddir}

case "${INPUT_APPEND_CONFIGURE}" in
*--with-shared-gc*)
export RUBY_GC_LIBRARY='librubygc.default.so'
mkdir -p /home/runner/shared-gc
grouped make shared-gc SHARED_GC=default
;;
esac

grouped make showflags
grouped make all
grouped make test
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/launchable/setup/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ inputs:
required: false
default: ${{ github.workspace }}
description: >-
Directory to (re-)checkout source codes. Launchable retrives the commit information
Directory to (re-)checkout source codes. Launchable retrieves the commit information
from the directory.
launchable-workspace:
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/setup/directories/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ runs:
path: ${{ inputs.srcdir }}
fetch-depth: ${{ inputs.fetch-depth }}

- uses: actions/cache@3624ceb22c1c5a301c8db4169662070a689d9ea8 # v4.1.1
- uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a # v4.1.2
with:
path: ${{ inputs.srcdir }}/.downloaded-cache
key: downloaded-cache
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/check_misc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,7 @@ jobs:
# Generate only when document commit/PR
if: >-
${{false
|| contains(github.event.head_commit.message, '[ruby/rdoc]')
|| contains(github.event.head_commit.message, '[DOC]')
|| contains(github.event.head_commit.message, 'Document')
|| contains(github.event.pull_request.title, '[DOC]')
Expand Down
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@c36620d31ac7c881962c3d9dd939c40ec9434f2b # v3.26.12
uses: github/codeql-action/init@662472033e021d55d94146f66f6058822b0b39fd # v3.27.0
with:
languages: ${{ matrix.language }}

- name: Autobuild
uses: github/codeql-action/autobuild@c36620d31ac7c881962c3d9dd939c40ec9434f2b # v3.26.12
uses: github/codeql-action/autobuild@662472033e021d55d94146f66f6058822b0b39fd # v3.27.0

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@c36620d31ac7c881962c3d9dd939c40ec9434f2b # v3.26.12
uses: github/codeql-action/analyze@662472033e021d55d94146f66f6058822b0b39fd # v3.27.0
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@c36620d31ac7c881962c3d9dd939c40ec9434f2b # v3.26.12
uses: github/codeql-action/upload-sarif@662472033e021d55d94146f66f6058822b0b39fd # v3.27.0
with:
sarif_file: sarif-results/${{ matrix.language }}.sarif
continue-on-error: true
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@c36620d31ac7c881962c3d9dd939c40ec9434f2b # v3.26.12
uses: github/codeql-action/upload-sarif@662472033e021d55d94146f66f6058822b0b39fd # v3.27.0
with:
sarif_file: results.sarif
2 changes: 1 addition & 1 deletion .github/workflows/ubuntu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ jobs:

- name: Build shared GC
run: |
echo "RUBY_GC_LIBRARY=librubygc.default.so" >> $GITHUB_ENV
echo "RUBY_GC_LIBRARY=default" >> $GITHUB_ENV
make shared-gc SHARED_GC=default
if: ${{ matrix.shared_gc }}

Expand Down
25 changes: 0 additions & 25 deletions LEGAL
Original file line number Diff line number Diff line change
Expand Up @@ -702,31 +702,6 @@ mentioned below.
OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
SUCH DAMAGE.

[ext/json/generator/generator.c]

The file contains the following copyright notice.

>>>
Copyright 2001-2004:: Unicode, Inc.

Disclaimer::

This source code is provided as is by Unicode, Inc. No claims are
made as to fitness for any particular purpose. No warranties of any
kind are expressed or implied. The recipient agrees to determine
applicability of information provided. If this file has been
purchased on magnetic or optical media from Unicode, Inc., the
sole remedy for any claim will be exchange of defective media
within 90 days of receipt.

Limitations on Rights to Redistribute This Code::

Unicode, Inc. hereby grants the right to freely use the information
supplied in this file in the creation of products supporting the
Unicode Standard, and to make copies of this file in any form
for internal or external distribution as long as this notice
remains attached.

[ext/psych]
[test/psych]

Expand Down
22 changes: 12 additions & 10 deletions NEWS.md
Original file line number Diff line number Diff line change
Expand Up @@ -59,10 +59,6 @@ Note: We're only listing outstanding class updates.

## Stdlib updates

The following default gem is added.

* win32-registry 0.0.1

* Tempfile

* The keyword argument `anonymous: true` is implemented for Tempfile.create.
Expand All @@ -75,13 +71,18 @@ The following default gem is added.
* This library is now extracted from the Ruby repository to [ruby/net-http-sspi].
[[Feature #20775]]
The following default gem is added.
* win32-registry 0.0.1
The following default gems are updated.
* RubyGems 3.6.0.dev
* bundler 2.6.0.dev
* erb 4.0.4
* fiddle 1.1.3.dev
* fiddle 1.1.4.dev
* io-console 0.7.2
* ipaddr 1.2.7
* irb 1.14.1
* json 2.7.2
* logger 1.6.1
Expand All @@ -94,10 +95,15 @@ The following default gems are updated.
* resolv 0.4.0
* stringio 3.1.2.dev
* strscan 3.1.1.dev
* syntax_suggest 2.0.1
* time 0.4.0
* uri 0.13.1
* zlib 3.1.1
The following bundled gem is added.
* repl_type_completor 0.1.7
The following bundled gems are updated.
* minitest 5.25.1
Expand All @@ -107,7 +113,7 @@ The following bundled gems are updated.
* rexml 3.3.8
* rss 0.3.1
* net-ftp 0.3.8
* net-imap 0.4.16
* net-imap 0.4.17
* net-smtp 0.5.0
* rbs 3.6.1
* typeprof 0.21.11
Expand All @@ -129,10 +135,6 @@ The following bundled gems are promoted from default gems.
* syslog 0.1.2
* csv 3.3.0
The following bundled gem is added.
* repl_type_completor 0.1.7
See GitHub releases like [GitHub Releases of Logger] or changelog for
details of the default gems or bundled gems.
Expand Down
Loading

0 comments on commit d6d6255

Please sign in to comment.