MetzNet
/
dfhack
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix windows clcache path

develop
Myk Taylor 2023-07-30 21:39:39 -07:00
parent 0364557533
commit a0fae55c90
No known key found for this signature in database
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
.github/workflows/build-windows.yml vendored
Unescape Escape View File

@ -27,23 +27,21 @@ jobs:
if: inputs.platform-files if: inputs.platform-files
- run: pip install 'sphinx<4.4.0' - run: pip install 'sphinx<4.4.0'
if: inputs.common-files if: inputs.common-files
- name: Clone DFHack
uses: actions/checkout@v3
with:
submodules: true
fetch-depth: ${{ !inputs.platform-files && 1 || 0 }}
- name: Fetch clcache - name: Fetch clcache
if: inputs.platform-files if: inputs.platform-files
uses: actions/cache@v3 uses: actions/cache@v3
with: with:
path: ${{ github.env.HOME }}/clcache path: clcache
key: win-msvc-${{ inputs.cache-id }}-${{ github.sha }} key: win-msvc-${{ inputs.cache-id }}-${{ github.sha }}
restore-keys: | restore-keys: |
win-msvc-${{ inputs.cache-id }} win-msvc-${{ inputs.cache-id }}
win-msvc win-msvc
- name: Clone DFHack
uses: actions/checkout@v3
with:
submodules: true
fetch-depth: ${{ !inputs.platform-files && 1 || 0 }}
- name: Configure DFHack - name: Configure DFHack
env:
CLCACHE_DIR: ${{ github.env.HOME }}/clcache
run: cmake -S . -B build -G "Visual Studio 17 2022" -DCMAKE_INSTALL_PREFIX=build/image ${{ inputs.platform-files && '-DCMAKE_C_COMPILER_LAUNCHER=clcache' || '' }} ${{ inputs.platform-files && '-DCMAKE_CXX_COMPILER_LAUNCHER=clcache' || '' }} -DBUILD_LIBRARY:BOOL=${{ inputs.platform-files }} -DBUILD_PLUGINS:BOOL=${{ inputs.platform-files }} -DBUILD_STONESENSE:BOOL=${{ inputs.platform-files }} -DBUILD_DOCS:BOOL=${{ inputs.common-files }} -DINSTALL_DATA_FILES:BOOL=${{ inputs.common-files }} -DINSTALL_SCRIPTS:BOOL=${{ inputs.common-files }} run: cmake -S . -B build -G "Visual Studio 17 2022" -DCMAKE_INSTALL_PREFIX=build/image ${{ inputs.platform-files && '-DCMAKE_C_COMPILER_LAUNCHER=clcache' || '' }} ${{ inputs.platform-files && '-DCMAKE_CXX_COMPILER_LAUNCHER=clcache' || '' }} -DBUILD_LIBRARY:BOOL=${{ inputs.platform-files }} -DBUILD_PLUGINS:BOOL=${{ inputs.platform-files }} -DBUILD_STONESENSE:BOOL=${{ inputs.platform-files }} -DBUILD_DOCS:BOOL=${{ inputs.common-files }} -DINSTALL_DATA_FILES:BOOL=${{ inputs.common-files }} -DINSTALL_SCRIPTS:BOOL=${{ inputs.common-files }}
- name: Build DFHack - name: Build DFHack
run: cmake --build build -j 2 --config Release --target install run: cmake --build build -j 2 --config Release --target install

2
.github/workflows/build.yml vendored
Unescape Escape View File

@ -50,7 +50,7 @@ jobs:
- name: Download artifact - name: Download artifact
uses: actions/download-artifact@v3 uses: actions/download-artifact@v3
with: with:
name: test-${{ matrix.gcc }} name: test-gcc-${{ matrix.gcc }}
# - name: Fetch DF cache # - name: Fetch DF cache
# uses: actions/cache@v3 # uses: actions/cache@v3
# with: # with: