AxioDL
/
metaforce
mirror of https://github.com/AxioDL/metaforce.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

GitHub Actions: Fix Windows clang-cl path

This commit is contained in:
Luke Street 2021-03-13 09:41:14 -05:00
parent 78185e682e
commit 70e32b0456
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
.github/workflows/build.yml vendored
View File

@ -121,7 +121,7 @@ jobs:
runs-on: [ self-hosted, windows, x64 ] runs-on: [ self-hosted, windows, x64 ]
env: env:
LLVM_VERSION: 10.0.1 LLVM_VERSION: 10.0.1
Qt_VERSION: 6.0.2 Qt_VERSION: 5.15.2
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
with: with:
@ -197,7 +197,7 @@ jobs:
runs-on: windows-2019 runs-on: windows-2019
env: env:
LLVM_VERSION: 10.0.1 LLVM_VERSION: 10.0.1
Qt_VERSION: 6.0.2 Qt_VERSION: 5.15.2
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
with: with:
@ -224,18 +224,18 @@ jobs:
working-directory: ../temp working-directory: ../temp
run: ${{steps.download-llvm.outputs.filename}} /S /D=%RUNNER_WORKSPACE%\LLVM run: ${{steps.download-llvm.outputs.filename}} /S /D=%RUNNER_WORKSPACE%\LLVM
#- name: Cache Qt - name: Cache Qt
# id: cache-qt id: cache-qt
# uses: actions/cache@v1 uses: actions/cache@v1
# with: with:
# path: ../Qt path: ../Qt
# key: ${{runner.os}}-QtCache-${{env.Qt_VERSION}} key: ${{runner.os}}-QtCache-${{env.Qt_VERSION}}
#- name: Install Qt - name: Install Qt
# uses: jurplel/install-qt-action@v2 uses: jurplel/install-qt-action@v2
# with: with:
# version: ${{env.Qt_VERSION}} version: ${{env.Qt_VERSION}}
# cached: ${{steps.cache-qt.outputs.cache-hit}} cached: ${{steps.cache-qt.outputs.cache-hit}}
- name: Install dependencies - name: Install dependencies
run: choco install ninja vulkan-sdk run: choco install ninja vulkan-sdk
@ -251,9 +251,9 @@ jobs:
run: | run: |
cmake $env:GITHUB_WORKSPACE -GNinja -DCMAKE_BUILD_TYPE=RelWithDebInfo -DURDE_VECTOR_ISA=sse41 ` cmake $env:GITHUB_WORKSPACE -GNinja -DCMAKE_BUILD_TYPE=RelWithDebInfo -DURDE_VECTOR_ISA=sse41 `
-DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreaded ` -DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreaded `
-DCMAKE_C_COMPILER="C:/Program Files/LLVM/bin/clang-cl.exe" ` -DCMAKE_C_COMPILER="$env:RUNNER_WORKSPACE/LLVM/bin/clang-cl.exe" `
-DCMAKE_CXX_COMPILER="C:/Program Files/LLVM/bin/clang-cl.exe" ` -DCMAKE_CXX_COMPILER="$env:RUNNER_WORKSPACE/LLVM/bin/clang-cl.exe" `
-DCMAKE_LINKER="C:/Program Files/LLVM/bin/lld-link.exe" ` -DCMAKE_LINKER="$env:RUNNER_WORKSPACE/LLVM/bin/lld-link.exe" `
-DLLVM_ROOT_DIR="$env:RUNNER_WORKSPACE/LLVM" ` -DLLVM_ROOT_DIR="$env:RUNNER_WORKSPACE/LLVM" `
-DURDE_DLPACKAGE=urde-$env:GITHUB_RUN_NUMBER-win32-clang-x86_64 -DURDE_DLPACKAGE=urde-$env:GITHUB_RUN_NUMBER-win32-clang-x86_64