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' 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') }} diff --git a/tool/sync_default_gems.rb b/tool/sync_default_gems.rb index 029a27c8292b79..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` + `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)