WIP - CLI のCIビルドにブランチ、SHA情報を入れた

r-koubou · Dec 6, 2023 · 88341b9 · 88341b9
1 parent 59aa8a4
commit 88341b9
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 1 deletion.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -58,7 +58,7 @@ jobs:
         dotnet-version: ${{ env.DOTNET_SDK_VERSION }}
 
     - name: CLI Build
-      run: dotnet msbuild /nologo /t:Archive /p:Configuration=${{ inputs.build-configuration }} /p:PublishDir=${{ github.workspace }}/publish $ProjectFile
+      run: dotnet msbuild /nologo /t:Archive /p:Configuration=${{ inputs.build-configuration }} /p:PublishDir=${{ github.workspace }}/publish /p:GitBranch=${{ github.ref }} /p:GitCommitHash=${{ github.sha }} $ProjectFile
       shell: bash
       env:
         ProjectFile: KeySwitchManager/Sources/Runtime/Applications/CLI/publish.msbuild

diff --git a/KeySwitchManager/Sources/Runtime/Applications/CLI/Applications.CLI.csproj b/KeySwitchManager/Sources/Runtime/Applications/CLI/Applications.CLI.csproj
@@ -1,5 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
+    <!-- Set value from CI command -->
+    <PropertyGroup>
+        <GitBranch>N/A</GitBranch>
+        <GitCommitHash>N/A</GitCommitHash>
+    </PropertyGroup>
+
     <PropertyGroup>
         <!-- Assembly / Common -->
         <OutputType>Exe</OutputType>

diff --git a/KeySwitchManager/Sources/Runtime/Applications/CLI/GenerateVersion.msbuild b/KeySwitchManager/Sources/Runtime/Applications/CLI/GenerateVersion.msbuild
@@ -16,6 +16,11 @@ $(Product)
 ## Build At
 
 $([System.DateTime]::Now.ToString("yyyy-MM-dd HH:mm:ss %K"))
+
+## Git
+
+- Brabch: $(GitBranch)
+- Hash: $(GitCommitHash)
             </VersionText>
         </PropertyGroup>
 
@@ -25,4 +30,5 @@ $([System.DateTime]::Now.ToString("yyyy-MM-dd HH:mm:ss %K"))
                 Lines="$(VersionText)" />
     </Target>
 
+
 </Project>