Minor git commit improvement for ci

nfdi4plants · Jan 25, 2024 · 5b62fb6 · 5b62fb6
1 parent 4d7f4b8
commit 5b62fb6
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/build/Build.fs b/build/Build.fs
@@ -38,22 +38,25 @@ module ReleaseNoteTasks =
 
     open Fake.Extensions.Release
 
-    let createVersionFile(version: string) =
+    let createVersionFile(version: string, commit: bool) =
         let releaseDate = System.DateTime.UtcNow.ToShortDateString()
         Fake.DotNet.AssemblyInfoFile.createFSharp "src/Server/Version.fs"
             [   Fake.DotNet.AssemblyInfo.Title "Swate"
                 Fake.DotNet.AssemblyInfo.Version version
                 Fake.DotNet.AssemblyInfo.Metadata ("Version",version)
                 Fake.DotNet.AssemblyInfo.Metadata ("ReleaseDate",releaseDate)
             ]
+        if commit then 
+            run git ["add"; "."] __SOURCE_DIRECTORY__
+            run git ["commit"; "-m"; (sprintf "Release v%s :bookmark:" ProjectInfo.prereleaseTag)] __SOURCE_DIRECTORY__
 
     let updateReleaseNotes = Target.create "releasenotes" (fun config ->
         ReleaseNotes.ensure()
 
         ReleaseNotes.update(ProjectInfo.gitOwner, ProjectInfo.project, config)
 
         let newRelease = ReleaseNotes.load "RELEASE_NOTES.md"
-        createVersionFile(newRelease.AssemblyVersion)
+        createVersionFile(newRelease.AssemblyVersion, false)
 
         Trace.trace "Update Version.fs done!"
 
@@ -223,7 +226,6 @@ module Release =
 
     open System.Diagnostics
 
-
     let GetLatestGitTag () : string =
         let executeCommand (command: string) : string =
             let p = new Process()
@@ -265,8 +267,6 @@ module Release =
 
     let ForcePushNightly() =
         if promptYesNo "Ready to force push release to nightly branch?" then 
-            run git ["add"; "."] __SOURCE_DIRECTORY__
-            run git ["commit"; "-m"; (sprintf "Release v%s" ProjectInfo.prereleaseTag)] __SOURCE_DIRECTORY__
             run git ["push"; "-f"; "origin"; "HEAD:nightly"] __SOURCE_DIRECTORY__
         else
             failwith "aborted"
@@ -405,7 +405,7 @@ let main args =
             Release.SetPrereleaseTag()
             Release.CreatePrereleaseTag()
             let version = Release.GetLatestGitTag()
-            ReleaseNoteTasks.createVersionFile(version)
+            ReleaseNoteTasks.createVersionFile(version, true)
             Release.ForcePushNightly()
             0
         | _ -> 
@@ -421,7 +421,7 @@ let main args =
         | _ -> runOrDefault args
     | "version" :: a ->
         match a with
-        | "create-file" :: version :: a -> ReleaseNoteTasks.createVersionFile(version); 0
+        | "create-file" :: version :: a -> ReleaseNoteTasks.createVersionFile(version, false); 0
         | _ -> runOrDefault args
     | "cmdtest" :: a ->
         run git ["add"; "."] ""