From: Zettat123 <zettat123@gmail.com>
Date: Fri, 18 Oct 2024 02:36:23 +0000 (+0800)
Subject: Always update expiration time when creating an artifact (#32281) (#32285)
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=99cac1f50c4bceb8b28979caeea4af9e5129e85e;p=gitea.git

Always update expiration time when creating an artifact (#32281) (#32285)

Backport #32281

Fix #32256
---

diff --git a/models/actions/artifact.go b/models/actions/artifact.go
index 3d0a288e62..0bc66ba24e 100644
--- a/models/actions/artifact.go
+++ b/models/actions/artifact.go
@@ -69,7 +69,7 @@ func CreateArtifact(ctx context.Context, t *ActionTask, artifactName, artifactPa
 			OwnerID:      t.OwnerID,
 			CommitSHA:    t.CommitSHA,
 			Status:       int64(ArtifactStatusUploadPending),
-			ExpiredUnix:  timeutil.TimeStamp(time.Now().Unix() + 3600*24*expiredDays),
+			ExpiredUnix:  timeutil.TimeStamp(time.Now().Unix() + timeutil.Day*expiredDays),
 		}
 		if _, err := db.GetEngine(ctx).Insert(artifact); err != nil {
 			return nil, err
@@ -78,6 +78,13 @@ func CreateArtifact(ctx context.Context, t *ActionTask, artifactName, artifactPa
 	} else if err != nil {
 		return nil, err
 	}
+
+	if _, err := db.GetEngine(ctx).ID(artifact.ID).Cols("expired_unix").Update(&ActionArtifact{
+		ExpiredUnix: timeutil.TimeStamp(time.Now().Unix() + timeutil.Day*expiredDays),
+	}); err != nil {
+		return nil, err
+	}
+
 	return artifact, nil
 }