Fix goreleaser confusing major and full tag versions

Author: LandonTClipp

.github/workflows/tag-and-release.yml

@@ -38,7 +38,11 @@ jobs:
         id: tag
         run: |
           set +e
-          task -x tag
+          task -x tag 2>versions.txt
+
+          echo "requested_version=$(cut -d',' -f 1 versions.txt)" >> $GITHUB_OUTPUT
+          echo "previous_version=$(cut -d',' -f 2 versions.txt)" >> $GITHUB_OUTPUT
+
           tag_result="$?"
           echo "tag_result=$tag_result" >> $GITHUB_OUTPUT
           # The range between 8 and 63 inclusive is reserved for custom
@@ -88,3 +92,5 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GORELEASER_GITHUB_TOKEN }}
           HOMEBREW_TAP_TOKEN: ${{ secrets.GORELEASER_HOMEBREW_TAP_TOKEN }}
+          GORELEASER_CURRENT_TAG: ${{ needs.tag.outputs.requested_version }}
+          GORELEASER_PREVIOUS_TAG: ${{ needs.tag.outputs.previous_version }}

mockery-tools.env

@@ -1 +1 @@
-VERSION=v3.0.0-alpha.3
+VERSION=v3.0.0-alpha.4

tools/cmd/root.go

@@ -42,7 +42,7 @@ func NewRootCmd() *cobra.Command {
 	}
 
 	logger = zerolog.New(zerolog.ConsoleWriter{
-		Out: os.Stdout,
+		Out: os.Stderr,
 	}).Hook(timestampHook{})
 
 	subCommands := []func(v *viper.Viper) (*cobra.Command, error){
@@ -64,8 +64,8 @@ func printStack(err error) {
 	}
 	newErr, ok := err.(*errors.Error)
 	if ok {
-		fmt.Printf("%v\n", newErr.ErrorStack())
+		fmt.Fprintf(os.Stderr, "%v\n", newErr.ErrorStack())
 	} else {
-		fmt.Printf("%v\n", err)
+		fmt.Fprintf(os.Stderr, "%v\n", err)
 	}
 }

tools/cmd/tag.go

@@ -32,7 +32,11 @@ func NewTagCmd(v *viper.Viper) (*cobra.Command, error) {
 				printStack(err)
 				os.Exit(1)
 			}
-			if err := tagger.Tag(); err != nil {
+			requestedVersion, previousVersion, err := tagger.Tag()
+			if requestedVersion != nil && previousVersion != nil {
+				fmt.Fprintf(os.Stdout, "%s,%s", requestedVersion.String(), previousVersion.String())
+			}
+			if err != nil {
 				if errors.Is(ErrNoNewVersion, err) {
 					os.Exit(EXIT_CODE_NO_NEW_VERSION)
 				}
@@ -147,25 +151,25 @@ type Tagger struct {
 	Version string `mapstructure:"version" validate:"required"`
 }
 
-func (t *Tagger) Tag() error {
+func (t *Tagger) Tag() (requestedVersion *semver.Version, previousVersion *semver.Version, err error) {
 	repo, err := git.PlainOpen(".")
 	if err != nil {
-		return errors.New(err)
+		return nil, nil, errors.New(err)
 	}
 
-	requestedVersion, err := semver.NewVersion(t.Version)
+	requestedVersion, err = semver.NewVersion(t.Version)
 	if err != nil {
 		logger.Err(err).Str("requested-version", string(t.Version)).Msg("error when constructing semver from version config")
-		return errors.New(err)
+		return requestedVersion, nil, errors.New(err)
 	}
 
-	largestTag, err := t.largestTagSemver(repo, requestedVersion.Major())
+	previousVersion, err = t.largestTagSemver(repo, requestedVersion.Major())
 	if err != nil {
-		return err
+		return requestedVersion, previousVersion, err
 	}
-	taggedVersion, err := semver.NewVersion(largestTag.String())
+	taggedVersion, err := semver.NewVersion(previousVersion.String())
 	if err != nil {
-		return errors.New(err)
+		return requestedVersion, previousVersion, errors.New(err)
 	}
 	logger := logger.With().
 		Stringer("tagged-version", taggedVersion).Logger()
@@ -178,28 +182,28 @@ func (t *Tagger) Tag() error {
 	if !requestedVersion.GreaterThan(taggedVersion) {
 		logger.Info().
 			Msg("VERSION is not greater than latest git tag, nothing to do.")
-		return ErrNoNewVersion
+		return requestedVersion, previousVersion, ErrNoNewVersion
 	}
 
 	worktree, err := repo.Worktree()
 	if err != nil {
-		return errors.New(err)
+		return requestedVersion, previousVersion, errors.New(err)
 	}
 
 	status, err := worktree.Status()
 	if err != nil {
-		return errors.New(err)
+		return requestedVersion, previousVersion, errors.New(err)
 	}
 	if !status.IsClean() {
 		logger.Error().Msg("git is in a dirty state, can't tag.")
 		fmt.Println(status.String())
-		return errors.New("dirty git state")
+		return requestedVersion, previousVersion, errors.New("dirty git state")
 	}
 
 	if err := t.createTag(repo, fmt.Sprintf("v%s", requestedVersion.String())); err != nil {
-		return err
+		return requestedVersion, previousVersion, err
 	}
 	logger.Info().Msg("created new tag. Push to origin still required.")
 
-	return nil
+	return requestedVersion, previousVersion, nil
 }