Merge pull request #211 from fslaborg/tag-based-release

Tag-based release

Author: florenzen

.github/workflows/dev-release.yml .github/workflows/publish.yml.github/workflows/dev-release.yml renamed to .github/workflows/publish.yml

@@ -1,21 +1,17 @@
-name: Dev Release
+name: Build and publish NuGet package
 
 on:
-  workflow_run:
-    workflows: [".NET Core"]
-    branches: [ dev ]
-    types:
-      - completed
+  push:
+    tags:
+      - 'v[0-9]+.[0-9]+.[0-9]+'
 
 jobs:
   publish-nuget:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
-      with:
-        ref: dev
-    - name: Setup .NET Core
-      uses: actions/setup-dotnet@v1
+    - name: Setup .NET SDK
+      uses: actions/setup-dotnet@v3
       with:
         dotnet-version: '8.x'
     - name: Build solution and generate NuGet Package

build/Build.fs

@@ -13,7 +13,7 @@ let rootDir = __SOURCE_DIRECTORY__ </> ".."
 let solutionFile = "Flips.sln"
 
 // Github repo
-let repo = "https://github.com/matthewcrews/flips"
+let repo = "https://github.com/fslaborg/flips"
 
 // Read additional information from the release notes document
 let release = ReleaseNotes.load (rootDir @@ "RELEASE_NOTES.md")
@@ -186,43 +186,50 @@ let initTargets () =
     // --------------------------------------------------------------------------------------
     // Release Scripts
 
-    let gitPush msg =
-        Git.Staging.stageAll ""
-        Git.Commit.exec "" msg
-        Git.Branches.push ""
-
-    Target.create "GitPush"
+    Target.create "Publish"
     <| fun p ->
-        p.Context.Arguments
-        |> List.choose (fun s ->
-            match s.StartsWith("--Msg=") with
-            | true -> Some(s.Substring 6)
-            | false -> None)
-        |> List.tryHead
-        |> function
-            | Some(s) -> s
-            | None -> (sprintf "Bump version to %s" release.NugetVersion)
-        |> gitPush
-
-    Target.create "GitTag"
-    <| fun _ ->
-        Git.Branches.tag "" release.NugetVersion
-        Git.Branches.pushTag "" "origin" release.NugetVersion
+        // Expect version to be released a argument as a sanity check to prevent releases by accident.
+        let announcedVersion =
+            match p.Context.Arguments |> List.tryHead with
+            | None -> failwithf "Please specify a version number, e.g. '... -t Publish 2.5.0'"
+            | Some version -> version
+
+        if announcedVersion <> release.NugetVersion then
+            failwithf
+                "Version '%s' does not match latest version in the RELEASE_NOTES '%s'"
+                announcedVersion
+                release.NugetVersion
+
+        let currentBranch = Git.Information.getBranchName ""
+
+        if not (Git.Information.isCleanWorkingCopy "") then
+            failwith "You must have a clean working copy to release. Please commit or stash your changes."
+
+        if currentBranch <> "main" then
+            failwithf "You must be on the 'main' branch to release. Current branch is '%s'" currentBranch
+
+        let local = Git.Information.getCurrentSHA1 ""
+        let remote = Git.Branches.getSHA1 "" ("origin/" + currentBranch)
+
+        if Git.Information.isAheadOf "" local remote then
+            failwithf
+                "Your local branch must not be ahead of the remote branch '%s'. Please push your changes before releasing."
+                currentBranch
+
+        let tagName = sprintf "v%s" release.NugetVersion
+        Git.Branches.tag "" tagName
 
     // --------------------------------------------------------------------------------------
     // Run all targets by default. Invoke 'build -t <Target>' to override
 
     Target.create "All" ignore
     Target.create "Dev" ignore
     Target.create "Release" ignore
-    Target.create "Publish" ignore
 
     "Clean" ==> "Restore" ==> "Build" |> ignore
 
     "Build" ==> "RunTests" |> ignore
 
-    "All" ==> "GitPush" ?=> "GitTag" |> ignore
-
     "All" <== [ "RunTests" ]
 
     "CleanDocs" ==> "CopyDocFiles" ==> "PrepDocs" |> ignore
@@ -238,8 +245,7 @@ let initTargets () =
 
     "Release" <== [ "All"; "NuGet"; "ConfigRelease" ]
 
-    "Publish"
-    <== [ "Release"; "ConfigRelease"; "NuGetPublish"; "Build"; "GitTag"; "GitPush" ]
+    "Release" ==> "Publish" |> ignore
 
 [<EntryPoint>]
 let main argv =