diff options
| -rw-r--r-- | .gitlab-ci.yml | 6 | ||||
| -rw-r--r-- | CMakeLists.txt | 3 | ||||
| -rw-r--r-- | default.vdf.conf (renamed from gitlab.vdf) | 8 |
3 files changed, 11 insertions, 6 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index dbf9a1e..6bc8f59 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -67,9 +67,13 @@ package-windows: steam: stage: deploy + # All build-*/ will have matching vdfs generated as they are configured from scratch against same revision. needs: ["build-linux", "package-linux", "package-windows"] script: - - steamcmd +login "$STEAM_USERNAME" "$STEAM_PASSWORD" $STEAM_GUARD +run_app_build "$CI_PROJECT_DIR/build-linux/gitlab.vdf" +quit + - steamcmd + +login "$STEAM_USERNAME" "$STEAM_PASSWORD" $STEAM_GUARD + +run_app_build "$CI_PROJECT_DIR/build-linux/default.vdf" + +quit artifacts: paths: - .steam_cache/ diff --git a/CMakeLists.txt b/CMakeLists.txt index 0245b2c..55fdcc3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -23,5 +23,6 @@ add_subdirectory(sim) add_subdirectory(stats) add_subdirectory(universe) add_version_file(version.txt version.txt.conf) -add_version_file(gitlab.vdf gitlab.vdf.conf) +add_version_file(default.vdf default.vdf.conf) add_custom_target(version ALL DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/version.txt") +add_custom_target(vdfs ALL DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/default.vdf") diff --git a/gitlab.vdf b/default.vdf.conf index e2f99df..7db6435 100644 --- a/gitlab.vdf +++ b/default.vdf.conf @@ -1,13 +1,13 @@ "AppBuild" { "AppID" "@STEAM_APPID@" - "Desc" "Default app build matching GitLab configuration" - "BuildOutput" ".steam_cache/" + "Desc" "Default build: @VERSION@" + "BuildOutput" "../.steam_cache/" "Depots" { "@STEAM_DEPOTID_WINDOWS@" { - "ContentRoot" "kurator-x86_64-windows/" + "ContentRoot" "../kurator-x86_64-windows/" "FileMapping" { "LocalPath" "*" @@ -17,7 +17,7 @@ } "@STEAM_DEPOTID_LINUX@" { - "ContentRoot" "kurator-x86_64-linux/" + "ContentRoot" "../kurator-x86_64-linux/" "FileMapping" { "LocalPath" "*" |