From e0a4e0031bf3a24f7e6a79c111d826f61c958723 Mon Sep 17 00:00:00 2001
From: Giovanni Harting <539@idlegandalf.com>
Date: Mon, 15 May 2023 16:03:49 +0200
Subject: [PATCH] merge lto & non-lto codepaths to reduce redundant code

---
 proto_package.go | 39 ++++++++++++++++-----------------------
 1 file changed, 16 insertions(+), 23 deletions(-)

diff --git a/proto_package.go b/proto_package.go
index 7390c2e..a89ff87 100644
--- a/proto_package.go
+++ b/proto_package.go
@@ -264,6 +264,7 @@ func (p *ProtoPackage) build(ctx context.Context) (time.Duration, error) {
 			ClearSkipReason().
 			SetBuildTimeStart(start).
 			ClearMaxRss().
+			ClearLastVersionBuild().
 			ClearIoOut().
 			ClearIoIn().
 			ClearUTime().
@@ -318,32 +319,24 @@ func (p *ProtoPackage) build(ctx context.Context) (time.Duration, error) {
 		}
 	}
 
+	updatePkg := p.DBPackage.Update().
+		SetStatus(dbpackage.StatusBuild).
+		SetLto(dbpackage.LtoEnabled).
+		SetBuildTimeStart(start).
+		SetLastVersionBuild(p.Version).
+		SetHash(p.Hash).
+		SetMaxRss(Rusage.Maxrss).
+		SetIoOut(Rusage.Oublock).
+		SetIoIn(Rusage.Inblock).
+		SetUTime(Rusage.Utime.Sec).
+		SetSTime(Rusage.Stime.Sec)
+
 	if p.DBPackage.Lto != dbpackage.LtoDisabled && p.DBPackage.Lto != dbpackage.LtoAutoDisabled {
-		p.DBPackage.Update().
-			SetStatus(dbpackage.StatusBuild).
-			SetLto(dbpackage.LtoEnabled).
-			SetBuildTimeStart(start).
-			SetLastVersionBuild(p.Version).
-			SetHash(p.Hash).
-			SetMaxRss(Rusage.Maxrss).
-			SetIoOut(Rusage.Oublock).
-			SetIoIn(Rusage.Inblock).
-			SetUTime(Rusage.Utime.Sec).
-			SetSTime(Rusage.Stime.Sec).
-			ExecX(ctx)
-	} else {
-		p.DBPackage.Update().
-			SetStatus(dbpackage.StatusBuild).
-			SetBuildTimeStart(start).
-			SetLastVersionBuild(p.Version).
-			SetMaxRss(Rusage.Maxrss).
-			SetIoOut(Rusage.Oublock).
-			SetIoIn(Rusage.Inblock).
-			SetUTime(Rusage.Utime.Sec).
-			SetSTime(Rusage.Stime.Sec).
-			SetHash(p.Hash).ExecX(ctx)
+		updatePkg.SetLto(dbpackage.LtoEnabled)
 	}
 
+	updatePkg.ExecX(ctx)
+
 	return time.Since(start), nil
 }