8299330: Minor improvements in MSYS2 Workflow handling
Reviewed-by: clanger, ihse
This commit is contained in:
parent
48c8fb39a7
commit
cf00d09c8c
4
.github/actions/get-msys2/action.yml
vendored
4
.github/actions/get-msys2/action.yml
vendored
@ -34,11 +34,11 @@ runs:
|
|||||||
with:
|
with:
|
||||||
install: 'autoconf tar unzip zip make'
|
install: 'autoconf tar unzip zip make'
|
||||||
path-type: minimal
|
path-type: minimal
|
||||||
location: msys2
|
location: ${{ runner.tool_cache }}/msys2
|
||||||
|
|
||||||
# We can't run bash until this is completed, so stick with pwsh
|
# We can't run bash until this is completed, so stick with pwsh
|
||||||
- name: 'Set MSYS2 path'
|
- name: 'Set MSYS2 path'
|
||||||
run: |
|
run: |
|
||||||
# Prepend msys2/msys64/usr/bin to the PATH
|
# Prepend msys2/msys64/usr/bin to the PATH
|
||||||
echo "$env:GITHUB_WORKSPACE/msys2/msys64/usr/bin" >> $env:GITHUB_PATH
|
echo "$env:RUNNER_TOOL_CACHE/msys2/msys64/usr/bin" >> $env:GITHUB_PATH
|
||||||
shell: pwsh
|
shell: pwsh
|
||||||
|
1
.github/workflows/build-windows.yml
vendored
1
.github/workflows/build-windows.yml
vendored
@ -125,6 +125,7 @@ jobs:
|
|||||||
# We need a minimal PATH on Windows
|
# We need a minimal PATH on Windows
|
||||||
# Set PATH to "", so just GITHUB_PATH is included
|
# Set PATH to "", so just GITHUB_PATH is included
|
||||||
PATH: ''
|
PATH: ''
|
||||||
|
shell: env /usr/bin/bash --login -eo pipefail {0}
|
||||||
|
|
||||||
- name: 'Build'
|
- name: 'Build'
|
||||||
id: build
|
id: build
|
||||||
|
Loading…
x
Reference in New Issue
Block a user