From 1ff6af5f442ec30a6b46cfd8320339c823140aa7 Mon Sep 17 00:00:00 2001 From: Jakob Harder <12190313+jakobharder@users.noreply.github.com> Date: Sun, 25 Feb 2024 17:09:41 +0100 Subject: [PATCH] test2 --- .github/workflows/test.yml | 4 +++- source/Burntime.MonoGame/get-file-version.bat | 2 +- source/Burntime.MonoGame/get-product-version.bat | 3 ++- source/Burntime.MonoGame/get-semver-version.bat | 2 +- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index dcd89d9..416d01d 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -15,4 +15,6 @@ jobs: fetch-depth: 0 - name: Test - run: git describe --tags + run: | + git describe --tags | + ./source/Burntime.MonoGame/get-product-version.bat diff --git a/source/Burntime.MonoGame/get-file-version.bat b/source/Burntime.MonoGame/get-file-version.bat index d769332..b7c4a6a 100644 --- a/source/Burntime.MonoGame/get-file-version.bat +++ b/source/Burntime.MonoGame/get-file-version.bat @@ -5,7 +5,7 @@ :: v1.2.3-1-asdf -> 1.2.3.1 :: v1.2-1-asdf -> 1.2.0.1 -FOR /F "tokens=1 delims==v+" %%n IN ('git describe --tags --abbrev=0') DO ( +FOR /F "tokens=1 delims==v+" %%n IN ('git describe --tags') DO ( FOR /F "tokens=1-3 delims==-" %%i IN ("%%n") DO ( IF "%%j%%k" == "" ( echo %%i diff --git a/source/Burntime.MonoGame/get-product-version.bat b/source/Burntime.MonoGame/get-product-version.bat index 08b56ea..1eee9dc 100644 --- a/source/Burntime.MonoGame/get-product-version.bat +++ b/source/Burntime.MonoGame/get-product-version.bat @@ -4,6 +4,7 @@ :: v1.2.3-rc1 -> 1.2.3-rc1 :: v1.2.3-1-asdf -> 1.2.3-1-asdf -FOR /F "tokens=1-2 delims==v+" %%i IN ('git describe --tags --abbrev=0') DO ( +git describe --tags +FOR /F "tokens=1-2 delims==v+" %%i IN ('git describe --tags') DO ( echo %%i ) diff --git a/source/Burntime.MonoGame/get-semver-version.bat b/source/Burntime.MonoGame/get-semver-version.bat index ade71a4..9f61026 100644 --- a/source/Burntime.MonoGame/get-semver-version.bat +++ b/source/Burntime.MonoGame/get-semver-version.bat @@ -6,7 +6,7 @@ :: v1.2-1-asdf -> 1.2.0.1 :: v1.2.3-rc1+abc -> 1.2.3-rc1 -FOR /F "tokens=1 delims==v+" %%n IN ('git describe --tags --abbrev=0') DO ( +FOR /F "tokens=1 delims==v+" %%n IN ('git describe --tags') DO ( FOR /F "tokens=1-3 delims==-" %%i IN ("%%n") DO ( IF "%%j%%k" == "" ( echo %%i