From a396d940ebfbac5b6adeb15d4dbfa99295f85822 Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA Date: Wed, 20 Aug 2025 10:24:20 +0900 Subject: [PATCH 1/4] Restore prism/srcs.mk files --- tool/sync_default_gems.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tool/sync_default_gems.rb b/tool/sync_default_gems.rb index 029a27c8292b79..2a652ad132d1c0 100755 --- a/tool/sync_default_gems.rb +++ b/tool/sync_default_gems.rb @@ -330,7 +330,7 @@ def sync_default_gems(gem) rm_rf("test/prism/snapshots") rm("prism/extconf.rb") - `git checkout prism/generate-srcs.mk.rb` + `git checkout prism/generate-srcs.mk.rb prism/srcs.mk*` when "resolv" rm_rf(%w[lib/resolv.* ext/win32/resolv test/resolv ext/win32/lib/win32/resolv.rb]) cp_r("#{upstream}/lib/resolv.rb", "lib") From f7687c4a513dbf397a076c7653f28e26fea52828 Mon Sep 17 00:00:00 2001 From: Jamie Magee Date: Tue, 19 Aug 2025 19:23:18 -0700 Subject: [PATCH 2/4] Enable Dependabot updates for vcpkg See https://github.blog/changelog/2025-08-12-dependabot-version-updates-now-support-vcpkg/ --- .github/dependabot.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 426893be2af281..2c2982d1d45a75 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -16,3 +16,7 @@ updates: directory: '/yjit' schedule: interval: 'daily' + - package-ecosystem: 'vcpkg' + directory: '/' + schedule: + interval: 'daily' From 3443a0bc7413dbdd06f88234c3cd18e4bcc584fc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 20 Aug 2025 05:17:22 +0000 Subject: [PATCH 3/4] Bump actions/cache from 4.2.3 to 4.2.4 Bumps [actions/cache](https://github.com/actions/cache) from 4.2.3 to 4.2.4. - [Release notes](https://github.com/actions/cache/releases) - [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md) - [Commits](https://github.com/actions/cache/compare/5a3ec84eff668545956fd18022155c47e93e2684...0400d5f644dc74513175e3cd8d07132dd4860809) --- updated-dependencies: - dependency-name: actions/cache dependency-version: 4.2.4 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/windows.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 0b7bf25d95ff0b..3e85f7a1c5ef78 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -86,7 +86,7 @@ jobs: - name: Restore vcpkg artifact id: restore-vcpkg - uses: actions/cache/restore@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3 + uses: actions/cache/restore@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4 with: path: src\vcpkg_installed key: windows-${{ matrix.os }}-vcpkg-${{ hashFiles('src/vcpkg.json') }} @@ -98,7 +98,7 @@ jobs: if: ${{ ! steps.restore-vcpkg.outputs.cache-hit }} - name: Save vcpkg artifact - uses: actions/cache/save@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3 + uses: actions/cache/save@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4 with: path: src\vcpkg_installed key: windows-${{ matrix.os }}-vcpkg-${{ hashFiles('src/vcpkg.json') }} From ba9e787179734443f30e21a8f8199c20f3a45453 Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Wed, 20 Aug 2025 15:42:26 +0900 Subject: [PATCH 4/4] Revert the leftover of 90cb2bb871ff5d6d4d0dfbed2ee352c7ff818a87 --- tool/sync_default_gems.rb | 2 +- win32/setup.mak | 10 ---------- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/tool/sync_default_gems.rb b/tool/sync_default_gems.rb index 2a652ad132d1c0..cb4e0af50b0b3d 100755 --- a/tool/sync_default_gems.rb +++ b/tool/sync_default_gems.rb @@ -330,7 +330,7 @@ def sync_default_gems(gem) rm_rf("test/prism/snapshots") rm("prism/extconf.rb") - `git checkout prism/generate-srcs.mk.rb prism/srcs.mk*` + `git checkout prism/srcs.mk*` when "resolv" rm_rf(%w[lib/resolv.* ext/win32/resolv test/resolv ext/win32/lib/win32/resolv.rb]) cp_r("#{upstream}/lib/resolv.rb", "lib") diff --git a/win32/setup.mak b/win32/setup.mak index 6af70d58300561..275ccda3bb6578 100644 --- a/win32/setup.mak +++ b/win32/setup.mak @@ -238,16 +238,6 @@ MACHINE = x86 @echo # ENCODING>>$(MAKEFILE) @$(MAKE) -l -f $(srcdir)/win32/enc-setup.mak srcdir="$(srcdir)" MAKEFILE=$(MAKEFILE) -!ifdef BASERUBY -ruby = $(BASERUBY) -!else ifndef ruby -ruby = ruby -!endif -$(srcdir)/prism/srcs.mk: - $(ruby:/=\) $(srcdir)/prism/generate-srcs.mk.rb > $@ - --epilogue-: $(srcdir)/prism/srcs.mk - -epilogue-: nul @type << >>$(MAKEFILE)