CI: Fix xmake deadlock
This commit is contained in:
parent
df31666d0e
commit
e7fb28df7c
|
|
@ -40,7 +40,7 @@ jobs:
|
|||
|
||||
# Force xmake to a specific folder (for cache)
|
||||
- name: Set xmake env
|
||||
run: echo "XMAKE_GLOBALDIR=$(pwd)/xmake-global" >> $GITHUB_ENV
|
||||
run: echo "XMAKE_GLOBALDIR=$(pwd)/../xmake-global" >> $GITHUB_ENV
|
||||
|
||||
# Install xmake
|
||||
- name: Setup xmake
|
||||
|
|
@ -59,7 +59,7 @@ jobs:
|
|||
- name: Retrieve cached xmake dependencies
|
||||
uses: actions/cache@v2
|
||||
with:
|
||||
path: xmake-global/.xmake/packages
|
||||
path: ${{ env.XMAKE_GLOBALDIR }}/.xmake/packages
|
||||
key: ${{ runner.os }}-${{ matrix.arch }}-${{ matrix.mode }}-${{ steps.dep_hash.outputs.hash }}
|
||||
|
||||
# Setup compilation mode and install project dependencies
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@ jobs:
|
|||
|
||||
# Force xmake to a specific folder (for cache)
|
||||
- name: Set xmake env
|
||||
run: echo "XMAKE_GLOBALDIR=$(pwd)/xmake-global" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
|
||||
run: echo "XMAKE_GLOBALDIR=$(pwd)/../xmake-global" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
|
||||
|
||||
# Install xmake
|
||||
- name: Setup xmake
|
||||
|
|
@ -51,7 +51,7 @@ jobs:
|
|||
- name: Retrieve cached xmake dependencies
|
||||
uses: actions/cache@v2
|
||||
with:
|
||||
path: xmake-global\.xmake\packages
|
||||
path: ${{ env.XMAKE_GLOBALDIR }}\.xmake\packages
|
||||
key: ${{ runner.os }}-${{ matrix.arch }}-${{ matrix.mode }}-${{ steps.dep_hash.outputs.hash }}
|
||||
|
||||
# Setup compilation mode and install project dependencies
|
||||
|
|
|
|||
Loading…
Reference in New Issue