[前][次][番号順一覧][スレッド一覧]

ruby-changes:67266

From: Nobuyoshi <ko1@a...>
Date: Fri, 27 Aug 2021 09:35:17 +0900 (JST)
Subject: [ruby-changes:67266] 3711467362 (master): [Windows CI] Set PATCH path

https://git.ruby-lang.org/ruby.git/commit/?id=3711467362

From 37114673623c4d2b1d9f2c2ddfffba070b2d96e6 Mon Sep 17 00:00:00 2001
From: Nobuyoshi Nakada <nobu@r...>
Date: Thu, 26 Aug 2021 02:49:49 +0900
Subject: [Windows CI] Set PATCH path

---
 .github/workflows/windows.yml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index 4d2ae86..495789f 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -18,15 +18,21 @@ jobs: https://github.com/ruby/ruby/blob/trunk/.github/workflows/windows.yml#L18
     env:
       GITPULLOPTIONS: --no-tags origin ${{github.ref}}
       VCVARS: ${{ matrix.vcvars }}
-      PATCH: D:\a\_temp\msys\msys64\usr\bin\patch.exe
+      PATCH: C:\msys64\usr\bin\patch.exe
     steps:
       - run: md build
         working-directory:
       - uses: msys2/setup-msys2@v2
+        id: setup-msys2
         with:
           update: true
           install: >-
             patch
+        if: ${{ matrix.os != 'windows-2019' }}
+      - name: patch path
+        shell: msys2 {0}
+        run: echo PATCH=$(cygpath -wa $(command -v patch)) >> $GITHUB_ENV
+        if: ${{ steps.setup-msys2.outcome == 'success' }}
       - uses: actions/cache@v2
         with:
           path: C:\vcpkg\downloads
-- 
cgit v1.1


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]