Rim/gsc-tool
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 3 Wiki Activity

fix(build): branch name (#131)

Browse Source
This commit is contained in:
Xenxo Espasandín 2023-06-15 00:02:48 +02:00 committed by GitHub
parent bc966e5a89
commit b7abc97c06
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -176,7 +176,7 @@ jobs:
name: Deploy Release name: Deploy Release
runs-on: ubuntu-latest runs-on: ubuntu-latest
needs: [ build-win, build-mac, build-lin ] needs: [ build-win, build-mac, build-lin ]
if: startsWith(github.ref, 'refs/tags/') && github.event.base_ref == 'refs/heads/prod' if: startsWith(github.ref, 'refs/tags/') && (github.event.base_ref == 'refs/heads/prod' || github.event.base_ref == 'refs/heads/dev')
steps: steps:
- name: Check out files - name: Check out files
uses: actions/checkout@v3 uses: actions/checkout@v3

6
premake5.lua
View File

@ -53,7 +53,11 @@ function generate_version()
proc3:close() proc3:close()
local split = version_split(version, revision) local split = version_split(version, revision)
local verstr = split[1] .. "." .. split[2] .. "." .. split[3] .. "." .. split[4] .. "-" .. branch local verstr = split[1] .. "." .. split[2] .. "." .. split[3] .. "." .. split[4]
if branch ~= "" then
verstr = verstr .. "-" .. branch
end
local file = assert(io.open("include/xsk/version.hpp", "w")) local file = assert(io.open("include/xsk/version.hpp", "w"))
file:write("// Generated by premake - do not edit\n\n") file:write("// Generated by premake - do not edit\n\n")

3
src/tool/main.cpp
View File

@ -1015,12 +1015,11 @@ auto print_usage() -> void
std::cout << "\t* game: iw5, iw6, iw7, iw8, iw9, s1, s2, s4, h1, h2, t6, t7, t8, t9\n"; std::cout << "\t* game: iw5, iw6, iw7, iw8, iw9, s1, s2, s4, h1, h2, t6, t7, t8, t9\n";
std::cout << "\t* system: pc, ps3, ps4, ps5, xb2 (360), xb3 (One), xb4 (Series X|S), wiiu\n"; std::cout << "\t* system: pc, ps3, ps4, ps5, xb2 (360), xb3 (One), xb4 (Series X|S), wiiu\n";
std::cout << "\t* path: file or directory (recursive)\n"; std::cout << "\t* path: file or directory (recursive)\n";
std::cin.get();
} }
auto branding() -> void auto branding() -> void
{ {
std::cout << fmt::format("\nGSC Tool {} created by xensik\n\n", XSK_VERSION_STR); std::cout << fmt::format("GSC Tool {} created by xensik\n\n", XSK_VERSION_STR);
} }
auto main(u32 argc, char** argv) -> void auto main(u32 argc, char** argv) -> void