Merge branch 'master' into remove-dependency-from-cont.h-to-prism

Author: nobu

.gdbinit

@@ -51,7 +51,7 @@ define rp
     printf "%sT_OBJECT%s: ", $color_type, $color_end
     print ((struct RObject *)($arg0))->basic
     if ($flags & ROBJECT_EMBED)
-      print/x *((VALUE*)((struct RObject*)($arg0))->as.ary) @ (rb_shape_get_shape($arg0)->capacity)
+      print/x *((VALUE*)((struct RObject*)($arg0))->as.ary) @ (RSHAPE_CAPACITY(rb_obj_shape_id($arg0)))
     else
       print (((struct RObject *)($arg0))->as.heap)
       if (((struct RObject*)($arg0))->as.heap.numiv) > 0

.github/actions/capiext/action.yml

@@ -0,0 +1,63 @@
+name: rubyspec C-API extensions
+
+inputs:
+  builddir:
+    required: false
+    default: '.'
+  make:
+    required: false
+    default: 'make -s'
+
+outputs:
+  key:
+    value: >-
+      ${{
+      !steps.restore.outputs.cache-hit &&
+      github.ref == 'refs/heads/master' &&
+      steps.config.outputs.key
+      }}
+
+runs:
+  using: composite
+
+  steps:
+    - id: config
+      shell: bash
+      run: |
+        eval $(grep -e '^arch *=' -e '^ruby_version *=' -e '^DLEXT *=' Makefile |
+            sed 's/ *= */=/')
+        case "${ruby_version}" in
+        *+*) key=capiexts-${arch}-${ruby_version};;
+        *)   key=;;
+        esac
+        echo version=$ruby_version >> $GITHUB_OUTPUT
+        echo key=$key >> $GITHUB_OUTPUT
+        echo DLEXT=$DLEXT >> $GITHUB_OUTPUT
+      working-directory: ${{ inputs.builddir }}
+
+    - name: CAPI extensions cache
+      uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
+      id: cache
+      with:
+        path: ${{ inputs.builddir }}/spec/ruby/optional/capi/ext/
+        key: ${{ steps.config.outputs.key }}
+      if: ${{ steps.config.outputs.key }}
+
+    - name: Run test-spec with previous CAPI extension binaries
+      id: check
+      shell: bash
+      run: |
+        touch spec/ruby/optional/capi/ext/*.$DLEXT
+        [ ! -f spec/ruby/optional/capi/ext/\*.$DLEXT ]
+        ${{ inputs.make }} SPECOPTS=optional/capi test-spec
+      env:
+        DLEXT: ${{ steps.config.outputs.DLEXT }}
+      working-directory: ${{ inputs.builddir }}
+      if: ${{ steps.cache.outputs.cache-hit }}
+
+    - shell: bash
+      run: |
+        echo "::error::Change from ${prev} detected; bump up ABI version"
+      env:
+        prev: ${{ steps.config.outputs.version }}
+      if: ${{ always() && steps.check.outcome == 'failure' }}

.github/actions/compilers/entrypoint.sh

@@ -26,7 +26,7 @@ export CONFIGURE_TTY='never'
 export RUBY_DEBUG='ci rgengc'
 export RUBY_TESTOPTS='-q --color=always --tty=no'
 export RUBY_DEBUG_COUNTER_DISABLE='1'
-export GNUMAKEFLAGS="-j$((1 + $(nproc --all)))"
+export GNUMAKEFLAGS="-j$((1 + $(nproc)))"
 
 case "x${INPUT_ENABLE_SHARED}" in
 x | xno | xfalse )

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

@@ -88,15 +88,15 @@ runs:
         git config --global init.defaultBranch garbage
 
     - if: inputs.checkout
-      uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
       with:
         path: ${{ inputs.srcdir }}
         fetch-depth: ${{ inputs.fetch-depth }}
 
-    - uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
+    - uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
       with:
         path: ${{ inputs.srcdir }}/.downloaded-cache
-        key: downloaded-cache
+        key: ${{ runner.os }}-${{ runner.arch }}-downloaded-cache
 
     - if: steps.which.outputs.autoreconf
       shell: bash
@@ -110,7 +110,7 @@ runs:
 
     - if: runner.os == 'Linux'
       shell: bash
-      run: echo "GNUMAKEFLAGS=-sj$((1 + $(nproc --all)))" >> "$GITHUB_ENV"
+      run: echo "GNUMAKEFLAGS=-sj$((1 + $(nproc)))" >> "$GITHUB_ENV"
 
     # macOS' GNU make is so old that they doesn't understand `GNUMAKEFLAGS`.
     - if: runner.os == 'macOS'

.github/auto_request_review.yml

@@ -10,7 +10,6 @@ files:
   'zjit/src/cruby_bindings.inc.rs': []
   'doc/zjit*': [team:jit]
   'test/ruby/test_zjit*': [team:jit]
-  'test/.excludes-zjit/*': [team:jit]
   'defs/jit.mk': [team:jit]
 options:
   ignore_draft: true

.github/dependabot.yml

@@ -16,3 +16,7 @@ updates:
     directory: '/yjit'
     schedule:
       interval: 'daily'
+  - package-ecosystem: 'vcpkg'
+    directory: '/'
+    schedule:
+      interval: 'daily'

.github/workflows/annocheck.yml

@@ -39,9 +39,7 @@ jobs:
     if: >-
       ${{!(false
       || contains(github.event.head_commit.message, '[DOC]')
-      || contains(github.event.head_commit.message, 'Document')
       || contains(github.event.pull_request.title, '[DOC]')
-      || contains(github.event.pull_request.title, 'Document')
       || contains(github.event.pull_request.labels.*.name, 'Documentation')
       || (github.event_name == 'push' && github.event.pull_request.user.login == 'dependabot[bot]')
       )}}
@@ -63,7 +61,7 @@ jobs:
       - run: id
         working-directory:
 
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
           sparse-checkout-cone-mode: false
           sparse-checkout: /.github
@@ -74,7 +72,7 @@ jobs:
           builddir: build
           makeup: true
 
-      - uses: ruby/setup-ruby@a4effe49ee8ee5b8b5091268c473a4628afb5651 # v1.245.0
+      - uses: ruby/setup-ruby@a9bfc2ecf3dd40734a9418f89a7e9d484c32b990 # v1.248.0
         with:
           ruby-version: '3.1'
           bundler: none

.github/workflows/baseruby.yml

@@ -35,9 +35,7 @@ jobs:
     if: >-
       ${{!(false
       || contains(github.event.head_commit.message, '[DOC]')
-      || contains(github.event.head_commit.message, 'Document')
       || contains(github.event.pull_request.title, '[DOC]')
-      || contains(github.event.pull_request.title, 'Document')
       || contains(github.event.pull_request.labels.*.name, 'Documentation')
       || (github.event_name == 'push' && github.event.pull_request.user.login == 'dependabot[bot]')
       )}}
@@ -50,12 +48,12 @@ jobs:
           - ruby-3.3
 
     steps:
-      - uses: ruby/setup-ruby@a4effe49ee8ee5b8b5091268c473a4628afb5651 # v1.245.0
+      - uses: ruby/setup-ruby@a9bfc2ecf3dd40734a9418f89a7e9d484c32b990 # v1.248.0
         with:
           ruby-version: ${{ matrix.ruby }}
           bundler: none
 
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
 
       - uses: ./.github/actions/setup/ubuntu
 

.github/workflows/bundled_gems.yml

@@ -31,7 +31,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
           token: ${{ (github.repository == 'ruby/ruby' && !startsWith(github.event_name, 'pull')) && secrets.MATZBOT_AUTO_UPDATE_TOKEN || secrets.GITHUB_TOKEN }}
 
@@ -82,6 +82,67 @@ jobs:
           echo gems=$gems >> $GITHUB_OUTPUT
           echo update=${news:-$gems} >> $GITHUB_OUTPUT
 
+      - name: Commit
+        id: commit
+        run: |
+          git pull --ff-only origin ${GITHUB_REF#refs/heads/}
+          message="Update bundled gems list"
+          if [ -z "${gems}" ]; then
+            git commit --message="[DOC] ${message} at ${GITHUB_SHA:0:30}"
+          else
+            git commit --message="${message} as of ${TODAY}"
+          fi
+        env:
+          TODAY: ${{ steps.bundled_gems.outputs.latest_date || env.TODAY }}
+          EMAIL: svn-admin@ruby-lang.org
+          GIT_AUTHOR_NAME: git
+          GIT_COMMITTER_NAME: git
+          gems: ${{ steps.diff.outputs.gems }}
+        if: ${{ steps.diff.outputs.update }}
+
+      - name: Development revision of bundled gems
+        run: |
+          #!ruby
+          file = "gems/bundled_gems"
+
+          SECONDS_IN_DAY = 86400
+          today = Time.new("#{ENV['TODAY']}Z")
+          if !(december = today.month == 12)
+            days = 30
+          elsif (days = 26 - today.day).positive?
+            days += 4
+          else
+            puts "::info:: just after released"
+            exit
+          end
+
+          since = "#{today.year-1}-12-26"
+          ref = ENV['GITHUB_REF']
+          puts "::group::\e[94mfetching \e[1m#{file}\e[22m since \e[1m#{since}\e[22m from \e[1m#{ref}\e[m"
+          system(*%W[git fetch --shallow-since=#{since} --no-tags origin #{ref}], exception: true)
+          puts "::endgroup::"
+
+          puts "\e[94mchecking development version bundled gems older than \e[1m#{days}\e[22m days\e[m"
+          limit = today.to_i - days * SECONDS_IN_DAY
+          old = 0
+          IO.popen(%W"git blame --line-porcelain -- #{file}") do |blame|
+            while head = blame.gets("\n\t") and s = blame.gets
+              next unless (gem = s.split(/\s+|#.*/)).size > 3
+              time = head[/^committer-time \K\d+/].to_i
+              next if (d = limit - time) <= 0
+              d /= SECONDS_IN_DAY
+              line = head[/\A\h+ \d+ \K\d+/].to_i
+              level = if d < days; 'warning'; else old += 1; 'error'; end
+              d += days
+              puts "::#{level} file=#{file},line=#{line},title=Older than #{d} days::#{gem[0]} #{gem[3]}"
+            end
+          end
+          abort "::error title=Too long-standing gems::The release comes soon." if december and old.nonzero?
+        shell: ruby {0}
+        env:
+          file: ${{ steps.logs.outputs.file }}
+          days: ${{ steps.logs.outputs.days }}
+
       - name: Install libraries
         uses: ./.github/actions/setup/ubuntu
         if: ${{ steps.diff.outputs.gems }}
@@ -107,27 +168,14 @@ jobs:
           TEST_BUNDLED_GEMS_ALLOW_FAILURES: ''
         if: ${{ steps.diff.outputs.gems }}
 
-      - name: Commit
+      - name: Push
         run: |
-          git pull --ff-only origin ${GITHUB_REF#refs/heads/}
-          message="Update bundled gems list"
-          if [ -z "${gems}" ]; then
-            git commit --message="[DOC] ${message} at ${GITHUB_SHA:0:30}"
-          else
-            git commit --message="${message} as of ${TODAY}"
-          fi
           git push origin ${GITHUB_REF#refs/heads/}
-        env:
-          TODAY: ${{ steps.bundled_gems.outputs.latest_date || env.TODAY }}
-          EMAIL: svn-admin@ruby-lang.org
-          GIT_AUTHOR_NAME: git
-          GIT_COMMITTER_NAME: git
-          gems: ${{ steps.diff.outputs.gems }}
         if: >-
           ${{
           github.repository == 'ruby/ruby' &&
           !startsWith(github.event_name, 'pull') &&
-          steps.diff.outputs.update
+          steps.commit.outcome == 'success'
           }}
 
       - uses: ./.github/actions/slack

.github/workflows/check_dependencies.yml

@@ -30,7 +30,7 @@ jobs:
     runs-on: ${{ matrix.os }}
 
     steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
 
       - uses: ./.github/actions/setup/ubuntu
         if: ${{ contains(matrix.os, 'ubuntu') }}
@@ -40,19 +40,15 @@ jobs:
 
       - uses: ./.github/actions/setup/directories
 
-      - uses: ruby/setup-ruby@a4effe49ee8ee5b8b5091268c473a4628afb5651 # v1.245.0
+      - uses: ruby/setup-ruby@a9bfc2ecf3dd40734a9418f89a7e9d484c32b990 # v1.248.0
         with:
           ruby-version: '3.1'
           bundler: none
 
       - name: Run configure
         run: ./configure -C --disable-install-doc --disable-rubygems --with-gcc 'optflags=-O0' 'debugflags=-save-temps=obj -g'
 
-      - run: make all golf
-
-      - run: ./goruby -veh
-
-      - run: ruby tool/update-deps --fix
+      - run: make fix-depends
 
       - run: git diff --no-ext-diff --ignore-submodules --exit-code