actually use the new windows workflow

develop
Myk Taylor 2023-07-30 21:04:52 -07:00
parent 2bb972ff77
commit 0364557533
No known key found for this signature in database
2 changed files with 8 additions and 31 deletions

@ -62,7 +62,7 @@ jobs:
if: inputs.platform-files
uses: actions/cache@v3
with:
path: ~/.ccache
path: ~/.cache/ccache
key: linux-gcc-${{ inputs.gcc-ver }}-${{ inputs.cache-id }}-${{ github.sha }}
restore-keys: |
linux-gcc-${{ inputs.gcc-ver }}-${{ inputs.cache-id }}
@ -71,7 +71,6 @@ jobs:
env:
CC: gcc-${{ inputs.gcc-ver }}
CXX: g++-${{ inputs.gcc-ver }}
CCACHE_DIR: ${{ github.env.HOME }}/.ccache
run: |
cmake \
-S . \
@ -100,7 +99,7 @@ jobs:
run: |
ccache --max-size 50M
ccache --cleanup
ccache --show-stats
ccache --show-stats --verbose
- name: Format artifact name
if: inputs.append-date-and-hash
id: artifactname

@ -85,34 +85,12 @@ jobs:
package-win64:
name: Win64 package (native)
runs-on: windows-latest
steps:
- run: pip install clcache
- run: pip install 'sphinx<4.4.0'
- name: Fetch cache
uses: actions/cache@v3
with:
path: ~/clcache
key: clcache-win64-${{ github.sha }}
restore-keys: |
clcache-win64
- name: Clone DFHack
uses: actions/checkout@v3
with:
submodules: true
fetch-depth: 0
- name: Configure DFHack
run: cmake -S . -B build -G "Visual Studio 17 2022" -DCMAKE_INSTALL_PREFIX=build/image -DCMAKE_C_COMPILER_LAUNCHER=clcache -DCMAKE_CXX_COMPILER_LAUNCHER=clcache -DBUILD_DOCS:BOOL=1 -DBUILD_STONESENSE:BOOL=1
- name: Build DFHack
run: cmake --build build -j 2 --config Release --target install
- name: Format artifact name
uses: benjlevesque/short-sha@v2.2
id: short-sha
- name: Upload artifact
uses: actions/upload-artifact@v3
uses: ./.github/workflows/build-windows.yml
with:
name: dfhack-win64-build-${{ steps.short-sha.outputs.sha }}
path: build/image/*
artifact-name: dfhack-win64
append-date-and-hash: true
cache-id: msvc
secrets: inherit
build-cross-win64:
name: Win64 package