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

steam build workflow improvements 

improve cmake handling for downloading the sdk

set up GHA to cache the SDK download
develop
Kelly Kinkade 2023-04-25 16:02:15 -05:00
parent 35468e3f7f
commit 68a8c687ea
2 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.github/workflows/steam.yml vendored
Unescape Escape View File

@ -36,6 +36,12 @@ jobs:
restore-keys: | restore-keys: |
ccache-win64-cross-msvc-develop-${{ github.event.inputs.commit_hash }} ccache-win64-cross-msvc-develop-${{ github.event.inputs.commit_hash }}
ccache-win64-cross-msvc ccache-win64-cross-msvc
- name: Restore steam SDK
uses: action/cache@v3
with:
path: depends/steam/steamworks_sdk_156.zip
key: steam-sdk-156
enableCrossOsArchive: true
- name: Cross-compile win64 artifacts - name: Cross-compile win64 artifacts
env: env:
CMAKE_EXTRA_ARGS: '-DBUILD_STONESENSE:BOOL=1 -DBUILD_DFLAUNCH:BOOL=1' CMAKE_EXTRA_ARGS: '-DBUILD_STONESENSE:BOOL=1 -DBUILD_DFLAUNCH:BOOL=1'

21
package/windows/CMakeLists.txt
Unescape Escape View File

@ -9,13 +9,22 @@ if(WIN32)
${STEAMAPI_DIR}/steamworks_sdk_156.zip ${STEAMAPI_DIR}/steamworks_sdk_156.zip
EXPECTED_HASH MD5=af5a579990dbe5ae4c1b0689260d001b EXPECTED_HASH MD5=af5a579990dbe5ae4c1b0689260d001b
USERPWD $ENV{steam_username}:$ENV{steam_password} USERPWD $ENV{steam_username}:$ENV{steam_password}
STATUS STEAM_SDK_DOWNLOAD_STATUS
SHOW_PROGRESS
) )
file(ARCHIVE_EXTRACT list(GET STEAM_SDK_DOWNLOAD_STATUS 0 STEAM_SDK_DL_STATUS_CODE)
INPUT ${STEAMAPI_DIR}/steamworks_sdk_156.zip list(GET STEAM_SDK_DOWNLOAD_STATUS 1 STEAM_SDK_DL_ERROR_MESSAGE)
DESTINATION ${STEAMAPI_DIR}) if (NOT (${STEAM_SDK_DL_STATUS_CODE} EQUAL 0))
set(STEAMAPI_LIBRARY "${STEAMAPI_DIR}/sdk/redistributable_bin/win64/steam_api64.lib") message(FATAL_ERROR "Steam SDK download: " ${STEAM_SDK_DL_ERROR_MESSAGE})
set(STEAMAPI_SOURCE_DIR "${STEAMAPI_DIR}/sdk/public/steam") else ()
set(STEAMAPI_SHARED_LIBRARY "${STEAMAPI_DIR}/sdk/redistributable_bin/win64/steam_api64.dll") message(STATUS "Steam SDK download: " ${STEAM_SDK_DL_ERROR_MESSAGE})
file(ARCHIVE_EXTRACT
INPUT ${STEAMAPI_DIR}/steamworks_sdk_156.zip
DESTINATION ${STEAMAPI_DIR})
set(STEAMAPI_LIBRARY "${STEAMAPI_DIR}/sdk/redistributable_bin/win64/steam_api64.lib")
set(STEAMAPI_SOURCE_DIR "${STEAMAPI_DIR}/sdk/public/steam")
set(STEAMAPI_SHARED_LIBRARY "${STEAMAPI_DIR}/sdk/redistributable_bin/win64/steam_api64.dll")
endif()
else() else()
message(SEND_ERROR "Need to set steam_username and steam_password in environment to download Steamworks SDK") message(SEND_ERROR "Need to set steam_username and steam_password in environment to download Steamworks SDK")
endif() endif()