From 95fd59e968c1a8d51bfd06a623c7eb8362c41502 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 17 Aug 2026 02:15:07 +0000 Subject: [PATCH 1/4] Bump the github-actions group across 1 directory with 4 updates Bumps the github-actions group with 4 updates in the / directory: [github/codeql-action/init](https://github.com/github/codeql-action), [github/codeql-action/analyze](https://github.com/github/codeql-action), [github/codeql-action/upload-sarif](https://github.com/github/codeql-action) and [taiki-e/install-action](https://github.com/taiki-e/install-action). Updates `github/codeql-action/init` from 4.37.6 to 4.37.7 - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/github/codeql-action/compare/5595ccaf912efad79be6eef63a5619ff05969be3...ff2f1c621b7f889edc0d3c761ac2e6a3f8cdb0dd) Updates `github/codeql-action/analyze` from 4.37.6 to 4.37.7 - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/github/codeql-action/compare/5595ccaf912efad79be6eef63a5619ff05969be3...ff2f1c621b7f889edc0d3c761ac2e6a3f8cdb0dd) Updates `github/codeql-action/upload-sarif` from 4.37.6 to 4.37.7 - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/github/codeql-action/compare/5595ccaf912efad79be6eef63a5619ff05969be3...ff2f1c621b7f889edc0d3c761ac2e6a3f8cdb0dd) Updates `taiki-e/install-action` from 2.85.11 to 2.85.13 - [Release notes](https://github.com/taiki-e/install-action/releases) - [Changelog](https://github.com/taiki-e/install-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/taiki-e/install-action/compare/7f4eb899022d8fe70b20c4f3de697aa85c309026...82cd3e7658a6f96c86c0234aeeda1748937cb0a1) --- updated-dependencies: - dependency-name: github/codeql-action/init dependency-version: 4.37.7 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: github-actions - dependency-name: github/codeql-action/analyze dependency-version: 4.37.7 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: github-actions - dependency-name: github/codeql-action/upload-sarif dependency-version: 4.37.7 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: github-actions - dependency-name: taiki-e/install-action dependency-version: 2.85.13 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: github-actions ... Signed-off-by: dependabot[bot] --- .github/workflows/check_sast.yml | 6 +++--- .github/workflows/scorecards.yml | 2 +- .github/workflows/zjit-macos.yml | 2 +- .github/workflows/zjit-ubuntu.yml | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/check_sast.yml b/.github/workflows/check_sast.yml index af35f0a5a59928..a33b242892cd21 100644 --- a/.github/workflows/check_sast.yml +++ b/.github/workflows/check_sast.yml @@ -78,14 +78,14 @@ jobs: persist-credentials: false - name: Initialize CodeQL - uses: github/codeql-action/init@5595ccaf912efad79be6eef63a5619ff05969be3 # v4.37.6 + uses: github/codeql-action/init@ff2f1c621b7f889edc0d3c761ac2e6a3f8cdb0dd # v4.37.7 with: languages: ${{ matrix.language }} build-mode: none config-file: .github/codeql/codeql-config.yml - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@5595ccaf912efad79be6eef63a5619ff05969be3 # v4.37.6 + uses: github/codeql-action/analyze@ff2f1c621b7f889edc0d3c761ac2e6a3f8cdb0dd # v4.37.7 with: category: '/language:${{ matrix.language }}' upload: False @@ -127,7 +127,7 @@ jobs: continue-on-error: true - name: Upload SARIF - uses: github/codeql-action/upload-sarif@5595ccaf912efad79be6eef63a5619ff05969be3 # v4.37.6 + uses: github/codeql-action/upload-sarif@ff2f1c621b7f889edc0d3c761ac2e6a3f8cdb0dd # v4.37.7 with: sarif_file: sarif-results/${{ matrix.language }}.sarif continue-on-error: true diff --git a/.github/workflows/scorecards.yml b/.github/workflows/scorecards.yml index 1f7e23275a0c4e..541d2a869b18f8 100644 --- a/.github/workflows/scorecards.yml +++ b/.github/workflows/scorecards.yml @@ -73,6 +73,6 @@ jobs: # Upload the results to GitHub's code scanning dashboard (optional). # Commenting out will disable upload of results to your repo's Code Scanning dashboard - name: "Upload to code-scanning" - uses: github/codeql-action/upload-sarif@5595ccaf912efad79be6eef63a5619ff05969be3 # v4.37.6 + uses: github/codeql-action/upload-sarif@ff2f1c621b7f889edc0d3c761ac2e6a3f8cdb0dd # v4.37.7 with: sarif_file: results.sarif diff --git a/.github/workflows/zjit-macos.yml b/.github/workflows/zjit-macos.yml index 95eae1f727b8fc..30da0afd491c86 100644 --- a/.github/workflows/zjit-macos.yml +++ b/.github/workflows/zjit-macos.yml @@ -98,7 +98,7 @@ jobs: rustup install ${{ matrix.rust_version }} --profile minimal rustup default ${{ matrix.rust_version }} - - uses: taiki-e/install-action@7f4eb899022d8fe70b20c4f3de697aa85c309026 # v2.85.11 + - uses: taiki-e/install-action@82cd3e7658a6f96c86c0234aeeda1748937cb0a1 # v2.85.13 with: tool: nextest@0.9 if: ${{ matrix.test_task == 'zjit-check' }} diff --git a/.github/workflows/zjit-ubuntu.yml b/.github/workflows/zjit-ubuntu.yml index 8b0b9c9439e2e2..24b55dde8ed8f4 100644 --- a/.github/workflows/zjit-ubuntu.yml +++ b/.github/workflows/zjit-ubuntu.yml @@ -152,7 +152,7 @@ jobs: ruby-version: '3.1' bundler: none - - uses: taiki-e/install-action@7f4eb899022d8fe70b20c4f3de697aa85c309026 # v2.85.11 + - uses: taiki-e/install-action@82cd3e7658a6f96c86c0234aeeda1748937cb0a1 # v2.85.13 with: tool: nextest@0.9 if: ${{ matrix.test_task == 'zjit-check' }} From 89dc7b1004a9ad5a69b9697df18b4ffcc01b2d04 Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Mon, 17 Aug 2026 12:05:20 +0900 Subject: [PATCH 2/4] Silently delete directories that may not exist [ci skip] --- common.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/common.mk b/common.mk index 7113829bc5f037..68c0e1e33587fa 100644 --- a/common.mk +++ b/common.mk @@ -1353,8 +1353,8 @@ build-tool/dump_ast$(BUILD_EXEEXT): build-tool/Makefile clean-local:: clean-build-tool clean-build-tool: - - cd build-tool && $(MAKE) clean 2> $(NULL) || $(NULLCMD) - - $(RMDIR) build-tool + - cd build-tool 2> $(NULL) && $(MAKE) clean 2> $(NULL) || $(NULLCMD) + - $(RMDIR) build-tool 2> $(NULL) || $(NULLCMD) $(srcdir)/revision.h$(no_baseruby:no=~disabled~): $(REVISION_H) @@ -2045,7 +2045,7 @@ clean-modular-gc: gc/clean distclean-modular-gc: gc/distclean realclean-modular-gc: gc/realclean distclean-modular-gc realclean-modular-gc: - -$(Q) $(RMDIR) gc + -$(Q) $(RMDIR) gc 2> $(NULL) || $(NULLCMD) help: PHONY $(MESSAGE_BEGIN) \ From c63df6edd536eb1adeeb143e4b4cd43232de1113 Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Mon, 17 Aug 2026 12:59:57 +0900 Subject: [PATCH 3/4] Use configured libruby in mkmf checks Let bundled extension checks use the selected shared or static Ruby library. --- lib/mkmf.rb | 3 +-- test/mkmf/test_mkmf.rb | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/lib/mkmf.rb b/lib/mkmf.rb index 40ae9d20b81680..d48780bd1f50bb 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -539,7 +539,6 @@ def try_do(src, command, **opts, &b) end def link_config(ldflags, opt="", libpath=$DEFLIBPATH|$LIBPATH) - librubyarg = $extmk ? $LIBRUBYARG_STATIC : "$(LIBRUBYARG)" conf = RbConfig::CONFIG.merge('hdrdir' => $hdrdir.quote, 'src' => "#{conftest_source}", 'arch_hdrdir' => $arch_hdrdir.quote, @@ -550,7 +549,7 @@ def link_config(ldflags, opt="", libpath=$DEFLIBPATH|$LIBPATH) 'ARCH_FLAG' => "#$ARCH_FLAG", 'LDFLAGS' => "#$LDFLAGS #{ldflags}", 'LOCAL_LIBS' => "#$LOCAL_LIBS #$libs", - 'LIBS' => "#{librubyarg} #{opt} #$LIBS") + 'LIBS' => "$(LIBRUBYARG) #{opt} #$LIBS") conf['LIBPATH'] = libpathflag(libpath.map {|s| RbConfig::expand(s.dup, conf)}) conf end diff --git a/test/mkmf/test_mkmf.rb b/test/mkmf/test_mkmf.rb index 55f9aa3b889211..092f42976c1b05 100644 --- a/test/mkmf/test_mkmf.rb +++ b/test/mkmf/test_mkmf.rb @@ -11,3 +11,17 @@ class TestMkmfGlobal < Test::Unit::TestCase end end end + +class TestMkmfLinkConfig < Test::Unit::TestCase + def test_use_configured_libruby_for_bundled_extensions + librubyarg = RbConfig::CONFIG["LIBRUBYARG"] + + RbConfig::CONFIG["LIBRUBYARG"] = "-lruby" + assert_include(Shellwords.shellsplit(link_command("")), "-lruby") + + RbConfig::CONFIG["LIBRUBYARG"] = "-lruby-static" + assert_include(Shellwords.shellsplit(link_command("")), "-lruby-static") + ensure + RbConfig::CONFIG["LIBRUBYARG"] = librubyarg + end +end From 4ff63b6b349cc681770cc15e40fa33d02e0c63cc Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Mon, 17 Aug 2026 14:12:19 +0900 Subject: [PATCH 4/4] Enable shared libraries in LTO compiler jobs Let `mkmf` checks use `libruby.so` to avoid repeatedly processing LTO bitcode from `libruby-static.a`, while `miniruby` retains LTO coverage for the Ruby core. --- .github/workflows/compilers.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/compilers.yml b/.github/workflows/compilers.yml index 99b8f08c29fdc5..e5c964ad39d4e5 100644 --- a/.github/workflows/compilers.yml +++ b/.github/workflows/compilers.yml @@ -66,7 +66,6 @@ jobs: tag: clang-22 with_gcc: 'clang-22 -flto=auto' optflags: '-O2' - enable_shared: false timeout-minutes: 30 - { uses: './.github/actions/compilers', name: '-O0', with: { optflags: '-O0 -march=x86-64 -mtune=generic' }, timeout-minutes: 8 } # - { uses: './.github/actions/compilers', name: '-O3', with: { optflags: '-O3 -march=x86-64 -mtune=generic', check: true } }