Find paths of tools [ci skip]
Recent GitHub Actions Windows containers seem having Strawberry tools.
This commit is contained in:
parent
15b2e91230
commit
e4fcac42d2
22
.github/workflows/windows.yml
vendored
22
.github/workflows/windows.yml
vendored
@ -51,7 +51,6 @@ jobs:
|
|||||||
|
|
||||||
env:
|
env:
|
||||||
GITPULLOPTIONS: --no-tags origin ${{ github.ref }}
|
GITPULLOPTIONS: --no-tags origin ${{ github.ref }}
|
||||||
PATCH: C:\msys64\usr\bin\patch.exe
|
|
||||||
OS_VER: windows-${{ matrix.vs < 2022 && '2019' || matrix.vs }}
|
OS_VER: windows-${{ matrix.vs < 2022 && '2019' || matrix.vs }}
|
||||||
# FIXME: This is a workaround for the vcpkg's issue present as of openssl 3.1.1
|
# FIXME: This is a workaround for the vcpkg's issue present as of openssl 3.1.1
|
||||||
# where OpenSSL's default modules directory is incorrectly set to C:\vcpkg\packages\openssl_x64-windows\bin
|
# where OpenSSL's default modules directory is incorrectly set to C:\vcpkg\packages\openssl_x64-windows\bin
|
||||||
@ -62,18 +61,25 @@ jobs:
|
|||||||
- run: md build
|
- run: md build
|
||||||
working-directory:
|
working-directory:
|
||||||
|
|
||||||
|
- name: find tools
|
||||||
|
id: find-tools
|
||||||
|
run: |
|
||||||
|
::- find needed tools
|
||||||
|
set NEEDS=
|
||||||
|
for %%I in (patch.exe) do if "%%~$PATH:I" == "" (
|
||||||
|
echo NEEDS=%NEEDS% %%I
|
||||||
|
) else (
|
||||||
|
echo %%I: %%~$PATH:I
|
||||||
|
)
|
||||||
|
echo needs=%NEEDS% >> %GITHUB_OUTPUT%
|
||||||
|
|
||||||
- uses: msys2/setup-msys2@d40200dc2db4c351366b048a9565ad82919e1c24 # v2
|
- uses: msys2/setup-msys2@d40200dc2db4c351366b048a9565ad82919e1c24 # v2
|
||||||
id: setup-msys2
|
id: setup-msys2
|
||||||
with:
|
with:
|
||||||
update: true
|
update: true
|
||||||
install: >-
|
install: >-
|
||||||
patch
|
${{ steps.find-patch.outputs.needs }}
|
||||||
if: ${{ env.OS_VER != 'windows-2019' }}
|
if: ${{ steps.find-patch.outputs.needs != '' }}
|
||||||
|
|
||||||
- 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@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1
|
- uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1
|
||||||
with:
|
with:
|
||||||
|
Loading…
x
Reference in New Issue
Block a user