Merge branch 'master' into endless_stmt

.appveyor.yml

@@ -26,8 +26,9 @@ environment:
     # is limited, and compatibility issues that happen only in newer versions are rare.
     # You may test some other stuff on GitHub Actions instead.
     - build: vs
-      vs: 120
+      vs: 120 # Visual Studio 2013
       ssl: OpenSSL-v111
+      # The worker image name. This is NOT the Visual Studio version we're using here.
       APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
       GEMS_FOR_TEST: ""
   RELINE_TEST_ENCODING: "UTF-8"
@@ -47,6 +48,7 @@ for:
     - cd C:\Tools\vcpkg
     - git pull -q
     - .\bootstrap-vcpkg.bat
+    - ps: Start-FileDownload 'https://github.com/microsoft/vcpkg-tool/releases/download/2023-08-09/vcpkg.exe' -FileName 'C:\Tools\vcpkg\vcpkg.exe'
     - cd %APPVEYOR_BUILD_FOLDER%
     - vcpkg --triplet %Platform%-windows install --x-use-aria2 libffi libyaml readline zlib
     - CALL SET vcvars=%%^VS%VS%COMNTOOLS^%%..\..\VC\vcvarsall.bat
@@ -92,8 +94,8 @@ for:
     - nmake -l "TESTOPTS=-v -q" btest
     - nmake -l "TESTOPTS=-v -q" test-basic
     - >-
-      nmake -l "TESTOPTS=-v --timeout-scale=3.0
-      --excludes=../test/excludes/_appveyor -j%JOBS%
+      nmake -l "TESTOPTS=--timeout-scale=3.0
+      --excludes=../test/.excludes/_appveyor -j%JOBS%
       --exclude win32ole
       --exclude test_bignum
       --exclude test_syntax
@@ -103,15 +105,15 @@ for:
     # separately execute tests without -j which may crash worker with -j.
     - >-
       nmake -l
-      "TESTOPTS=-v --timeout-scale=3.0 --excludes=../test/excludes/_appveyor"
+      "TESTOPTS=--timeout-scale=3.0 --excludes=../test/.excludes/_appveyor"
       TESTS="
       ../test/win32ole
       ../test/ruby/test_bignum.rb
       ../test/ruby/test_syntax.rb
       ../test/open-uri/test_open-uri.rb
       ../test/rubygems/test_bundled_ca.rb
       " test-all
-    - nmake -l test-spec MSPECOPT=-fs # not using `-j` because sometimes `mspec -j` silently dies on Windows
+    - nmake -l test-spec # not using `-j` because sometimes `mspec -j` silently dies on Windows
 notifications:
   - provider: Webhook
     method: POST

.gdbinit

@@ -689,11 +689,6 @@ define nd_stts
 end
 
 
-define nd_entry
-  printf "%su3.entry%s: ", $color_highlite, $color_end
-  p ($arg0).u3.entry
-end
-
 define nd_vid
   printf "%su1.id%s: ", $color_highlite, $color_end
   p ($arg0).u1.id

.git-blame-ignore-revs

@@ -22,3 +22,7 @@ f28287d34c03f472ffe90ea262bdde9affd4b965
 
 # Make benchmark indentation consistent
 fc4acf8cae82e5196186d3278d831f2438479d91
+
+# Make prism_compile.c indentation consistent
+40b2c8e5e7e6e5f83cee9276dc9c1922a69292d6
+d2c5867357ed88eccc28c2b3bd4a46e206e7ff85

.github/actions/setup/directories/action.yml

@@ -29,6 +29,21 @@ inputs:
     description: >-
       If set to true, additionally runs `make up`.
 
+  checkout:
+    required: false
+    type: boolean
+    default: true
+    description: >-
+      If set to '' (false), skip running actions/checkout. This is useful when
+      you don't want to overwrite a GitHub token that is already set up.
+
+  dummy-files:
+    required: false
+    type: boolean
+    default: ''
+    description: >-
+      If set to true, creates dummy files in build dir.
+
 outputs: {} # nothing?
 
 runs:
@@ -60,7 +75,8 @@ runs:
         git config --global advice.detachedHead 0
         git config --global init.defaultBranch garbage
 
-    - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
+    - if: inputs.checkout
+      uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
       with:
         path: ${{ inputs.srcdir }}
 
@@ -93,8 +109,9 @@ runs:
       working-directory: ${{ inputs.srcdir }}
       run: |
         touch config.status
-        touch rbconfig.time
-        sed -f tool/prereq.status template/Makefile.in common.mk > Makefile
+        touch .rbconfig.time
+        sed -f tool/prereq.status template/Makefile.in > Makefile
+        sed -f tool/prereq.status template/GNUmakefile.in > GNUmakefile
         make up
 
     # Cleanup, runs even on failure
@@ -109,3 +126,12 @@ runs:
         sudo chmod -R go-w /usr/share
         chmod -v go-w $HOME $HOME/.config || :
         sudo bash -c 'IFS=:; for d in '"$PATH"'; do chmod -v go-w $d; done' || :
+
+    - if: inputs.dummy-files == 'true'
+      shell: bash
+      working-directory: ${{ inputs.builddir }}
+      run: |
+        : Create dummy files in build dir
+        for basename in {a..z} {A..Z} {0..9} foo bar test zzz; do
+          echo > ${basename}.rb "raise %(do not load ${basename}.rb)"
+        done

.github/actions/setup/macos/action.yml

@@ -13,7 +13,6 @@ runs:
     - name: brew
       shell: bash
       run: |
-        brew upgrade --quiet
         brew install --quiet gmp libffi openssl@1.1 zlib autoconf automake libtool readline
 
     - name: Set ENV

.github/actions/slack/action.yml

@@ -36,3 +36,4 @@ runs:
           }
       env:
         SLACK_WEBHOOK_URL: ${{ inputs.SLACK_WEBHOOK_URL }}
+      if: ${{github.event_name == 'push' && startsWith(github.repository, 'ruby/')}}

.github/workflows/annocheck.yml

@@ -40,7 +40,13 @@ jobs:
       image: ghcr.io/ruby/ruby-ci-image:gcc-11
       options: --user root
 
-    if: ${{ !contains(github.event.head_commit.message, '[DOC]') && !contains(github.event.pull_request.labels.*.name, 'Documentation') }}
+    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]')
+      )}}
 
     env:
       CONFIGURE_TTY: never
@@ -59,7 +65,7 @@ jobs:
       - run: id
         working-directory:
 
-      - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
+      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
         with:
           sparse-checkout-cone-mode: false
           sparse-checkout: /.github
@@ -110,7 +116,7 @@ jobs:
       - uses: ./.github/actions/slack
         with:
           SLACK_WEBHOOK_URL: ${{ secrets.SIMPLER_ALERTS_URL }} # ruby-lang slack: ruby/simpler-alerts-bot
-        if: ${{ failure() && github.event_name == 'push' }}
+        if: ${{ failure() }}
 
 defaults:
   run:

.github/workflows/baseruby.yml

@@ -36,7 +36,13 @@ jobs:
 
     runs-on: ubuntu-20.04
 
-    if: ${{ !contains(github.event.head_commit.message, '[DOC]') && !contains(github.event.pull_request.labels.*.name, 'Documentation') }}
+    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]')
+      )}}
 
     strategy:
       matrix:
@@ -49,12 +55,12 @@ jobs:
           - ruby-3.2
 
     steps:
-      - uses: ruby/setup-ruby@250fcd6a742febb1123a77a841497ccaa8b9e939 # v1.152.0
+      - uses: ruby/setup-ruby@5cfe23c062c0aac352e765b1b7cc12ea5255ccc4 # v1.156.0
         with:
           ruby-version: ${{ matrix.ruby }}
           bundler: none
 
-      - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
+      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
 
       - uses: ./.github/actions/setup/ubuntu
 
@@ -72,4 +78,4 @@ jobs:
         with:
           label: ${{ matrix.ruby }}
           SLACK_WEBHOOK_URL: ${{ secrets.SIMPLER_ALERTS_URL }} # ruby-lang slack: ruby/simpler-alerts-bot
-        if: ${{ failure() && github.event_name == 'push' }}
+        if: ${{ failure() }}

.github/workflows/bundled_gems.yml

@@ -35,7 +35,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
+      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
 
       - uses: ./.github/actions/setup/directories
 
@@ -66,7 +66,7 @@ jobs:
         continue-on-error: true
 
       - name: Install libraries
-        uses: ./.gituhb/actions/setup/ubuntu
+        uses: ./.github/actions/setup/ubuntu
         if: ${{ steps.diff.outcome == 'failure' }}
 
       - name: Build
@@ -116,4 +116,4 @@ jobs:
       - uses: ./.github/actions/slack
         with:
           SLACK_WEBHOOK_URL: ${{ secrets.SIMPLER_ALERTS_URL }} # ruby-lang slack: ruby/simpler-alerts-bot
-        if: ${{ failure() && github.event_name == 'push' }}
+        if: ${{ failure() }}

.github/workflows/check_dependencies.yml

@@ -38,10 +38,16 @@ jobs:
 
     runs-on: ${{ matrix.os }}
 
-    if: ${{ !contains(github.event.head_commit.message, '[DOC]') && !contains(github.event.pull_request.labels.*.name, 'Documentation') }}
+    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@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
+      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
 
       - uses: ./.github/actions/setup/ubuntu
         if: ${{ contains(matrix.os, 'ubuntu') }}
@@ -64,4 +70,4 @@ jobs:
         with:
           label: ${{ matrix.os }} / Dependencies need to update
           SLACK_WEBHOOK_URL: ${{ secrets.SIMPLER_ALERTS_URL }} # ruby-lang slack: ruby/simpler-alerts-bot
-        if: ${{ failure() && github.event_name == 'push' }}
+        if: ${{ failure() }}

.github/workflows/check_misc.yml

@@ -16,9 +16,15 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
+      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+        with:
+          token: ${{ (github.repository == 'ruby/ruby' && !startsWith(github.event_name, 'pull')) && secrets.MATZBOT_GITHUB_TOKEN || secrets.GITHUB_TOKEN }}
 
       - uses: ./.github/actions/setup/directories
+        with:
+          makeup: true
+          # Skip overwriting MATZBOT_GITHUB_TOKEN
+          checkout: '' # false (ref: https://github.com/actions/runner/issues/2238)
 
       - name: Check if C-sources are US-ASCII
         run: |
@@ -101,4 +107,4 @@ jobs:
       - uses: ./.github/actions/slack
         with:
           SLACK_WEBHOOK_URL: ${{ secrets.SIMPLER_ALERTS_URL }} # ruby-lang slack: ruby/simpler-alerts-bot
-        if: ${{ failure() && github.event_name == 'push' }}
+        if: ${{ failure() }}