final bugfix i hope (#5)

.github/workflows/simver.yaml

@@ -30,7 +30,7 @@
                             },
                             {
                                 name: install simver,
-                                run: "go install github.com/walteh/simver/cmd/simver_github_actions@v0.5.0",
+                                run: "go install github.com/walteh/simver/cmd/simver_github_actions@v0.7.0-pr5+1",
                             },
                             {
                                 name: run simver,

calculate.go

@@ -90,13 +90,13 @@ func (me *Calculation) CalculateNewTagsRaw(ctx context.Context) *CalculationOutp
 		nvt = BumpPatch(mmrt)
 	}
 
-	if me.MyMostRecentBuild == 0 {
-		validMmrt = false
-
-		// force patch is ignored if this is a merge
-	} else if me.ForcePatch && !me.IsMerge {
-		nvt = BumpPatch(mmrt)
-		validMmrt = false
+	if !me.IsMerge {
+		if me.MyMostRecentBuild == 0 {
+			validMmrt = false
+		} else if me.ForcePatch {
+			nvt = BumpPatch(mmrt)
+			validMmrt = false
+		}
 	}
 
 	// if mmrt is invalid, then we need to reserve a new mmrt (which is the same as nvt)

calculate_test.go

@@ -287,6 +287,25 @@ func TestNewCalculationAndCalculateNewTags(t *testing.T) {
 				MergeTags: []string{},
 			},
 		},
+		{
+			name: "if is merge, build is 0, skip is false - tag mmrt",
+			calculation: &simver.Calculation{
+				ForcePatch:        false,
+				IsMerge:           true,
+				MostRecentLiveTag: "v0.18.0",
+				MyMostRecentBuild: 0.000000,
+				MyMostRecentTag:   "v0.18.1",
+				NextValidTag:      "v0.19.0",
+				PR:                14.000000,
+				Skip:              false,
+			},
+			output: &simver.CalculationOutput{
+				BaseTags:  []string{},
+				HeadTags:  []string{},
+				RootTags:  []string{},
+				MergeTags: []string{"v0.18.1"},
+			},
+		},
 	}
 
 	ctx := context.Background()