Skip to content

Commit 4f99224

Browse files
committed
8361478: GHA: Use MSYS2 from GHA runners
Backport-of: ed9066bdf48c2d9925aea745951531ebf4af35a8
1 parent 22183de commit 4f99224

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

.github/actions/get-msys2/action.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,15 @@ runs:
3030
using: composite
3131
steps:
3232
- name: 'Install MSYS2'
33-
uses: msys2/[email protected]
33+
id: msys2
34+
uses: msys2/[email protected]
3435
with:
3536
install: 'autoconf tar unzip zip make'
3637
path-type: minimal
37-
location: ${{ runner.tool_cache }}/msys2
38+
release: false
3839

3940
# We can't run bash until this is completed, so stick with pwsh
4041
- name: 'Set MSYS2 path'
4142
run: |
42-
# Prepend msys2/msys64/usr/bin to the PATH
43-
echo "$env:RUNNER_TOOL_CACHE/msys2/msys64/usr/bin" >> $env:GITHUB_PATH
43+
echo "${{ steps.msys2.outputs.msys2-location }}/usr/bin" >> $env:GITHUB_PATH
4444
shell: pwsh

0 commit comments

Comments
 (0)