Skip to content

Commit

Permalink
Merge branch 'master' into mmtk
Browse files Browse the repository at this point in the history
  • Loading branch information
wks committed Jan 30, 2024
2 parents 68a6bbf + 83966a5 commit b96430a
Show file tree
Hide file tree
Showing 1,090 changed files with 25,954 additions and 73,961 deletions.
3 changes: 3 additions & 0 deletions .document
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,9 @@ trace_point.rb
warning.rb
yjit.rb

# Errno::*
known_errors.inc

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

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 @@ -80,7 +80,7 @@ runs:
with:
path: ${{ inputs.srcdir }}

- uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1
- uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # v4.0.0
with:
path: ${{ inputs.srcdir }}/.downloaded-cache
key: downloaded-cache
Expand Down
14 changes: 13 additions & 1 deletion .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,18 @@
version: 2
updates:
- package-ecosystem: 'github-actions'
directory: '/.github'
directory: '/'
schedule:
interval: 'daily'
- package-ecosystem: 'github-actions'
directory: '/.github/actions/slack'
schedule:
interval: 'daily'
- package-ecosystem: 'github-actions'
directory: '/.github/actions/setup/directories'
schedule:
interval: 'daily'
- package-ecosystem: 'cargo'
directory: '/yjit'
schedule:
interval: 'daily'
2 changes: 0 additions & 2 deletions .github/workflows/annocheck.yml
Original file line number Diff line number Diff line change
Expand Up @@ -111,8 +111,6 @@ jobs:

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

- run: make test-annocheck

Expand Down
6 changes: 2 additions & 4 deletions .github/workflows/baseruby.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,16 +50,14 @@ jobs:
strategy:
matrix:
ruby:
- ruby-2.5
# - ruby-2.6
# - ruby-2.7
- ruby-2.7
- ruby-3.0
- ruby-3.1
- ruby-3.2
- ruby-3.3

steps:
- uses: ruby/setup-ruby@036ef458ddccddb148a2b9fb67e95a22fdbf728b # v1.160.0
- uses: ruby/setup-ruby@5daca165445f0ae10478593083f72ca2625e241d # v1.169.0
with:
ruby-version: ${{ matrix.ruby }}
bundler: none
Expand Down
8 changes: 0 additions & 8 deletions .github/workflows/check_misc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,14 +52,6 @@ jobs:
exit $fail
working-directory: include

# This should be able to be removed once old platforms are dropped.
- id: c99-check
name: Check for C99 features which may not be supported
run: |
# VC2013: z modifier for size_t is not supported.
grep -r -n --include='*.[chyS]' '%[0-9]*z[idu]' -- . && exit 1 || :
continue-on-error: true # Just show in the annotations

- id: gems
run: true
if: ${{ github.ref == 'refs/heads/master' }}
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/compilers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -278,8 +278,6 @@ jobs:
if: ${{ matrix.entry.check }}

- run: make test-spec
env:
CHECK_LEAKS: true
if: ${{ matrix.entry.check }}

- run: make test-annocheck
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/dependabot_automerge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
id: metadata

- name: Wait for status checks
uses: lewagon/wait-on-check-action@e106e5c43e8ca1edea6383a39a01c5ca495fd812 # v1.3.1
uses: lewagon/wait-on-check-action@595dabb3acf442d47e29c9ec9ba44db0c6bdd18f # v1.3.3
with:
repo-token: ${{ secrets.MATZBOT_GITHUB_TOKEN }}
ref: ${{ github.event.pull_request.head.sha || github.sha }}
Expand Down
8 changes: 5 additions & 3 deletions .github/workflows/macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,12 @@ jobs:
matrix:
test_task: ['check']
configure: ['']
os: ${{ fromJSON(format('["macos-11","macos-12"{0}]', (github.repository == 'ruby/ruby' && ',"macos-arm-oss"' || ''))) }}
os: ${{ fromJSON(format('["macos-12","macos-13"{0}]', (github.repository == 'ruby/ruby' && ',"macos-arm-oss"' || ''))) }}
include:
- test_task: test-all TESTS=--repeat-count=2
os: ${{ github.repository == 'ruby/ruby' && 'macos-arm-oss' || 'macos-12' }}
os: ${{ github.repository == 'ruby/ruby' && 'macos-arm-oss' || 'macos-13' }}
- test_task: test-bundled-gems
os: ${{ github.repository == 'ruby/ruby' && 'macos-arm-oss' || 'macos-13' }}
fail-fast: false

env:
Expand Down Expand Up @@ -83,7 +85,7 @@ jobs:
env:
RUBY_TESTOPTS: '-q --tty=no'
TESTS: ${{ matrix.test_task == 'check' && matrix.skipped_tests || '' }}
TEST_BUNDLED_GEMS_ALLOW_FAILURES: ''
TEST_BUNDLED_GEMS_ALLOW_FAILURES: 'typeprof'
PRECHECK_BUNDLED_GEMS: 'no'

- name: make skipped tests
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/mingw.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ jobs:
include:
# To mitigate flakiness of MinGW CI, we test only one runtime that newer MSYS2 uses.
- msystem: 'UCRT64'
base_ruby: head
baseruby: '2.7'
test_task: 'check'
test-all-opts: '--name=!/TestObjSpace#test_reachable_objects_during_iteration/'
fail-fast: false
Expand All @@ -74,9 +74,9 @@ jobs:

steps:
- name: Set up Ruby & MSYS2
uses: ruby/setup-ruby@036ef458ddccddb148a2b9fb67e95a22fdbf728b # v1.160.0
uses: ruby/setup-ruby@5daca165445f0ae10478593083f72ca2625e241d # v1.169.0
with:
ruby-version: ${{ matrix.base_ruby }}
ruby-version: ${{ matrix.baseruby }}

- name: where check
run: |
Expand Down
130 changes: 130 additions & 0 deletions .github/workflows/prism.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,130 @@
name: Prism
on:
push:
paths-ignore:
- 'doc/**'
- '**.md'
- '**.rdoc'
- '**/.document'
- '**.[1-8]'
- '**.ronn'
- '.*.yml'
pull_request:
paths-ignore:
- 'doc/**'
- '**.md'
- '**.rdoc'
- '**/.document'
- '**.[1-8]'
- '**.ronn'
- '.*.yml'
merge_group:
paths-ignore:
- 'doc/**'
- '**.md'
- '**.rdoc'
- '**/.document'
- '**.[1-8]'
- '**.ronn'
- '.*.yml'

concurrency:
group: ${{ github.workflow }} / ${{ startsWith(github.event_name, 'pull') && github.ref_name || github.sha }}
cancel-in-progress: ${{ startsWith(github.event_name, 'pull') }}

permissions:
contents: read

jobs:
make:
strategy:
matrix:
# main variables included in the job name
test_task: [check]
run_opts: ['--parser=prism']
arch: ['']
fail-fast: false

env:
GITPULLOPTIONS: --no-tags origin ${{ github.ref }}
RUBY_DEBUG: ci
SETARCH: ${{ matrix.arch && format('setarch {0}', matrix.arch) }}

runs-on: ubuntu-22.04

if: >-
${{!(false
|| contains(github.event.head_commit.message, '[DOC]')
|| contains(github.event.pull_request.title, '[DOC]')
|| contains(github.event.pull_request.labels.*.name, 'Documentation')
|| (github.event_name == 'push' && github.actor == 'dependabot[bot]')
)}}

steps:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
with:
sparse-checkout-cone-mode: false
sparse-checkout: /.github

- uses: ./.github/actions/setup/ubuntu

- uses: ./.github/actions/setup/directories
with:
srcdir: src
builddir: build
makeup: true

- name: Run configure
env:
arch: ${{ matrix.arch }}
run: >-
$SETARCH ../src/configure -C --disable-install-doc cppflags=-DRUBY_DEBUG
${arch:+--target=$arch-$OSTYPE --host=$arch-$OSTYPE}

- run: $SETARCH make

- name: make btest
run: |
make -s btest RUN_OPTS="$RUN_OPTS"
timeout-minutes: 30
env:
GNUMAKEFLAGS: ''
RUBY_TESTOPTS: '-v --tty=no'
RUN_OPTS: ${{ matrix.run_opts }}
continue-on-error: true

# - name: make test
# run: |
# $SETARCH make -s test RUN_OPTS="$RUN_OPTS"
# timeout-minutes: 30
# env:
# GNUMAKEFLAGS: ''
# RUBY_TESTOPTS: '-v --tty=no'
# RUN_OPTS: ${{ matrix.run_opts }}

# - name: make test-all
# run: |
# $SETARCH make -s test-all RUN_OPTS="$RUN_OPTS"
# timeout-minutes: 40
# env:
# GNUMAKEFLAGS: ''
# RUBY_TESTOPTS: '-q --tty=no'
# RUN_OPTS: ${{ matrix.run_opts }}

# - name: make test-spec
# run: |
# $SETARCH make -s test-spec RUN_OPTS="$RUN_OPTS"
# timeout-minutes: 10
# env:
# GNUMAKEFLAGS: ''
# RUN_OPTS: ${{ matrix.run_opts }}

- uses: ./.github/actions/slack
with:
label: ${{ matrix.run_opts }}
SLACK_WEBHOOK_URL: ${{ secrets.SIMPLER_ALERTS_URL }} # ruby-lang slack: ruby/simpler-alerts-bot
if: ${{ failure() }}

defaults:
run:
working-directory: build
2 changes: 1 addition & 1 deletion .github/workflows/rjit-bindgen.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ jobs:

steps:
- name: Set up Ruby
uses: ruby/setup-ruby@036ef458ddccddb148a2b9fb67e95a22fdbf728b # v1.160.0
uses: ruby/setup-ruby@5daca165445f0ae10478593083f72ca2625e241d # v1.169.0
with:
ruby-version: '3.1'

Expand Down
4 changes: 1 addition & 3 deletions .github/workflows/spec_guards.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ jobs:
steps:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1

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

- run: ruby ../mspec/bin/mspec
working-directory: spec/ruby
env:
CHECK_LEAKS: true

- uses: ./.github/actions/slack
with:
Expand Down
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:
env:
RUBY_TESTOPTS: '-q --tty=no'
TESTS: ${{ matrix.test_task == 'check' && matrix.skipped_tests || '' }}
TEST_BUNDLED_GEMS_ALLOW_FAILURES: ''
TEST_BUNDLED_GEMS_ALLOW_FAILURES: 'typeprof'
PRECHECK_BUNDLED_GEMS: 'no'

- name: make skipped tests
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@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3
uses: actions/upload-artifact@26f96dfa697d77e81fd5907df203aa23a56210a8 # v4.3.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@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3
- uses: actions/upload-artifact@26f96dfa697d77e81fd5907df203aa23a56210a8 # v4.3.0
if: ${{ github.event_name == 'pull_request' }}
with:
name: github-pr-info
Expand Down
14 changes: 12 additions & 2 deletions .github/workflows/windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -96,15 +96,21 @@ jobs:
${{ steps.find-tools.outputs.needs }}
if: ${{ steps.find-tools.outputs.needs != '' }}

- uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3.3.2
- uses: ruby/setup-ruby@5daca165445f0ae10478593083f72ca2625e241d # v1.169.0
with:
ruby-version: '2.7'
bundler: none
windows-toolchain: none

- uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # v4.0.0
with:
path: C:\vcpkg\downloads
key: ${{ runner.os }}-vcpkg-download-${{ env.OS_VER }}-${{ github.sha }}
restore-keys: |
${{ runner.os }}-vcpkg-download-${{ env.OS_VER }}-
${{ runner.os }}-vcpkg-download-

- uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3.3.2
- uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # v4.0.0
with:
path: C:\vcpkg\installed
key: ${{ runner.os }}-vcpkg-installed-${{ env.OS_VER }}-${{ github.sha }}
Expand Down Expand Up @@ -133,6 +139,7 @@ jobs:
builddir: build

- name: setup env
# Available Ruby versions: https://github.com/actions/runner-images/blob/main/images/windows/Windows2019-Readme.md#ruby
# %TEMP% is inconsistent with %TMP% and test-all expects they are consistent.
# https://github.com/actions/virtual-environments/issues/712#issuecomment-613004302
run: |
Expand All @@ -150,6 +157,9 @@ jobs:
C:\msys64\usr\bin\comm -13 old.env new.env >> %GITHUB_ENV%
del *.env

- name: baseruby version
run: ruby -v

- name: compiler version
run: cl

Expand Down
1 change: 1 addition & 0 deletions .github/workflows/yjit-macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,7 @@ jobs:
TESTS: ${{ matrix.test_task == 'check' && matrix.skipped_tests || '' }}
TEST_BUNDLED_GEMS_ALLOW_FAILURES: ''
PRECHECK_BUNDLED_GEMS: 'no'
continue-on-error: ${{ matrix.continue-on-test_task || false }}

- name: make skipped tests
run: |
Expand Down
Loading

0 comments on commit b96430a

Please sign in to comment.