diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index acba13a1..6f3a5094 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -26,13 +26,12 @@ jobs: uses: actions/checkout@v5 with: submodules: recursive - fetch-depth: 0 - name: Premake generate working-directory: ${{ github.workspace }} env: PREMAKE_NO_PROMPT: 1 - run: ./generate.sh + run: ./generate.sh --oat-version=${{ github.ref_name }} - name: Build working-directory: ${{ github.workspace }} @@ -62,7 +61,7 @@ jobs: working-directory: ${{ github.workspace }} env: PREMAKE_NO_PROMPT: 1 - run: ./generate.bat + run: ./generate.bat --oat-version=${{ github.ref_name }} - name: Build working-directory: ${{ github.workspace }} diff --git a/tools/scripts/options.lua b/tools/scripts/options.lua index 28ed3633..f1c5e51e 100644 --- a/tools/scripts/options.lua +++ b/tools/scripts/options.lua @@ -1,3 +1,9 @@ +newoption { + trigger = "oat-version", + description = "Set the OAT version being compiled.", + value = "VERSION", + default = "_" -- An empty string is not recognized as a default +} newoption { trigger = "debug-structureddatadef", description = "Activate additional debugging logic for StructuredDataDef assets" diff --git a/tools/scripts/version.lua b/tools/scripts/version.lua index dc0087f9..5b32b51f 100644 --- a/tools/scripts/version.lua +++ b/tools/scripts/version.lua @@ -2,13 +2,17 @@ local BuildSubFolderFolder = "premake" local HeaderFileName = "GitVersion.h" function GetGitVersion() + if _OPTIONS["oat-version"] ~= "_" then + return _OPTIONS["oat-version"] + end + result, errorCode = os.outputof("git describe --tags") if errorCode == 0 then return result end - return "Unknown" + return "dev" end function GetVersionHeaderFolder()