Merge pull request #129 from kirides/ci/git_version

automatically version based on git tags
kirides · Jan 15, 2023 · ed5b9ea · ed5b9ea
2 parents cd0d79e + fc79f17
commit ed5b9ea
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 0 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -26,6 +26,11 @@ jobs:
     - name: Add MSBuild to PATH
       uses: microsoft/setup-msbuild@v1
 
+    - name: Set tag and directory name env
+      run: |
+        $shortHash = $Env:GITHUB_SHA.Substring(0, 9)
+        echo (-join("CL=/DVERSION_NUMBER#",'\"',"-git-${shortHash}",'\"')) >> $Env:GITHUB_ENV
+
     - name: Restore NuGet packages
       working-directory: ${{env.GITHUB_WORKSPACE}}
       run: nuget restore .

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -20,10 +20,12 @@ jobs:
       run: |
         $tagName = $Env:GITHUB_REF -replace 'refs/tags/', ''
         $dirName = "GD3D11-${tagName}"
+        $shortHash = $Env:GITHUB_SHA.Substring(0, 9)
         echo "Tag: ${tagName}"
         echo "Directory: ${dirName}"
         echo "RELEASE_VERSION=${tagName}" >> $Env:GITHUB_ENV
         echo "RELEASE_DIR=${dirName}" >> $Env:GITHUB_ENV
+        echo (-join("CL=/DVERSION_NUMBER#",'\"',"${tagName}-${shortHash}",'\"')) >> $Env:GITHUB_ENV
 
     - name: Add MSBuild to PATH
       uses: microsoft/setup-msbuild@v1

diff --git a/D3D11Engine/pch.h b/D3D11Engine/pch.h
@@ -32,7 +32,10 @@ using namespace DirectX;
 
 #define ENABLE_TESSELATION 0
 
+#ifndef VERSION_NUMBER
 #define VERSION_NUMBER "17.8-dev9"
+#endif
+
 __declspec(selectany) const char* VERSION_NUMBER_STR = VERSION_NUMBER;
 
 extern bool FeatureLevel10Compatibility;