summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHiroshi SHIBATA <hsbt@ruby-lang.org>2025-07-08 18:44:24 +0900
committerHiroshi SHIBATA <hsbt@ruby-lang.org>2025-07-09 06:26:42 +0900
commit5aaedc052c63d42479bcec890505976337490d71 (patch)
treed3e789567de20710996c20bda17b895d1f7e8ede
parent80bf0744a08079da1e51f022489ab1a6859442fb (diff)
Re-ordered vcpkg related steps. It may be affected with VsDevCmd.bat
-rw-r--r--.github/workflows/windows.yml38
1 files changed, 19 insertions, 19 deletions
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index 8c95b605a2..c005beb8ad 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -68,6 +68,16 @@ jobs:
bundler: none
windows-toolchain: none
+ - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+ with:
+ sparse-checkout-cone-mode: false
+ sparse-checkout: /.github
+
+ - uses: ./.github/actions/setup/directories
+ with:
+ srcdir: src
+ builddir: build
+
- name: Install tools with scoop
run: |
Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Scope CurrentUser
@@ -76,15 +86,17 @@ jobs:
scoop install vcpkg uutils-coreutils cmake@3.31.6
shell: pwsh
- - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+ # vcpkg built-in cache is not working now
+ - name: Restore vcpkg artifact
+ uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
with:
- sparse-checkout-cone-mode: false
- sparse-checkout: /.github
+ path: src\vcpkg_installed
+ key: windows-${{ matrix.os }}-vcpkg-${{ hashFiles('src/vcpkg.json') }}
- - uses: ./.github/actions/setup/directories
- with:
- srcdir: src
- builddir: build
+ - name: Install libraries with vcpkg
+ run: |
+ vcpkg install --vcpkg-root=C:\Users\runneradmin\scoop\apps\vcpkg\current
+ working-directory: src
- name: setup env
# Available Ruby versions: https://github.com/actions/runner-images/blob/main/images/windows/Windows2019-Readme.md#ruby
@@ -116,18 +128,6 @@ jobs:
run: Get-Volume
shell: pwsh
- # vcpkg built-in cache is not working now
- - name: Restore vcpkg artifact
- uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
- with:
- path: src\vcpkg_installed
- key: windows-${{ matrix.os }}-vcpkg-${{ hashFiles('src/vcpkg.json') }}
-
- - name: Install libraries with vcpkg
- run: |
- vcpkg install --vcpkg-root=C:\Users\runneradmin\scoop\apps\vcpkg\current
- working-directory: src
-
# TODO: We should use `../src` instead of `D:/a/ruby/ruby/src`
- name: Configure
run: >-