sid/NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CI: Fix xmake deadlock

Browse Source
This commit is contained in:
Jérôme Leclercq
2021-05-08 10:35:20 +02:00
parent df31666d0e
commit e7fb28df7c
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/linux-build.yml vendored
View File

@@ -40,7 +40,7 @@ jobs:
# Force xmake to a specific folder (for cache) # Force xmake to a specific folder (for cache)
- name: Set xmake env - name: Set xmake env
run: echo "XMAKE_GLOBALDIR=$(pwd)/xmake-global" >> $GITHUB_ENV run: echo "XMAKE_GLOBALDIR=$(pwd)/../xmake-global" >> $GITHUB_ENV
# Install xmake # Install xmake
- name: Setup xmake - name: Setup xmake
@@ -59,7 +59,7 @@ jobs:
- name: Retrieve cached xmake dependencies - name: Retrieve cached xmake dependencies
uses: actions/cache@v2 uses: actions/cache@v2
with: with:
path: xmake-global/.xmake/packages path: ${{ env.XMAKE_GLOBALDIR }}/.xmake/packages
key: ${{ runner.os }}-${{ matrix.arch }}-${{ matrix.mode }}-${{ steps.dep_hash.outputs.hash }} key: ${{ runner.os }}-${{ matrix.arch }}-${{ matrix.mode }}-${{ steps.dep_hash.outputs.hash }}
# Setup compilation mode and install project dependencies # Setup compilation mode and install project dependencies

4
.github/workflows/windows-build.yml vendored
View File

@@ -32,7 +32,7 @@ jobs:
# Force xmake to a specific folder (for cache) # Force xmake to a specific folder (for cache)
- name: Set xmake env - 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 # Install xmake
- name: Setup xmake - name: Setup xmake
@@ -51,7 +51,7 @@ jobs:
- name: Retrieve cached xmake dependencies - name: Retrieve cached xmake dependencies
uses: actions/cache@v2 uses: actions/cache@v2
with: with:
path: xmake-global\.xmake\packages path: ${{ env.XMAKE_GLOBALDIR }}\.xmake\packages
key: ${{ runner.os }}-${{ matrix.arch }}-${{ matrix.mode }}-${{ steps.dep_hash.outputs.hash }} key: ${{ runner.os }}-${{ matrix.arch }}-${{ matrix.mode }}-${{ steps.dep_hash.outputs.hash }}
# Setup compilation mode and install project dependencies # Setup compilation mode and install project dependencies