Merge branch 'main' into lunny/fix_actions_edit_issue

go-gitea · Feb 18, 2024 · 12bf330 · 12bf330
2 parents e4e9368 + 68e1d17
commit 12bf330
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/services/actions/cleanup.go b/services/actions/cleanup.go
@@ -35,14 +35,14 @@ func cleanExpiredArtifacts(taskCtx context.Context) error {
  }
  log.Info("Found %d expired artifacts", len(artifacts))
  for _, artifact := range artifacts {
- if err := storage.ActionsArtifacts.Delete(artifact.StoragePath); err != nil {
- log.Error("Cannot delete artifact %d: %v", artifact.ID, err)
- continue
- }
  if err := actions.SetArtifactExpired(taskCtx, artifact.ID); err != nil {
  log.Error("Cannot set artifact %d expired: %v", artifact.ID, err)
  continue
  }
+ if err := storage.ActionsArtifacts.Delete(artifact.StoragePath); err != nil {
+ log.Error("Cannot delete artifact %d: %v", artifact.ID, err)
+ continue
+ }
  log.Info("Artifact %d set expired", artifact.ID)
  }
  return nil
@@ -59,14 +59,14 @@ func cleanNeedDeleteArtifacts(taskCtx context.Context) error {
  }
  log.Info("Found %d artifacts pending deletion", len(artifacts))
  for _, artifact := range artifacts {
- if err := storage.ActionsArtifacts.Delete(artifact.StoragePath); err != nil {
- log.Error("Cannot delete artifact %d: %v", artifact.ID, err)
- continue
- }
  if err := actions.SetArtifactDeleted(taskCtx, artifact.ID); err != nil {
  log.Error("Cannot set artifact %d deleted: %v", artifact.ID, err)
  continue
  }
+ if err := storage.ActionsArtifacts.Delete(artifact.StoragePath); err != nil {
+ log.Error("Cannot delete artifact %d: %v", artifact.ID, err)
+ continue
+ }
  log.Info("Artifact %d set deleted", artifact.ID)
  }
  if len(artifacts) < deleteArtifactBatchSize {