🎁 Generate images on resync (#51)

* Generate images on re-sync

* Generate images regardless of upstream changes to resync

Author: cardil

pkg/sync/operation.go

@@ -42,7 +42,7 @@ func (o Operation) switchToMain() error {
 	)
 }
 
-func (o Operation) commitChanges(message string) step {
+func (o Operation) commitChanges(message string, onCommit ...step) step {
 	return func() error {
 		o.Println("- Committing changes:", message)
 		commit, err := o.CommitChanges(message)
@@ -57,7 +57,14 @@ func (o Operation) commitChanges(message string) step {
 		if err == nil {
 			o.Printf("-- Statistics:\n%s\n", stats)
 		}
-		return errors.Wrap(err, ErrSyncFailed)
+		err = errors.Wrap(err, ErrSyncFailed)
+		for _, st := range onCommit {
+			if serr := st(); serr != nil {
+				err = errors.Join(err, serr)
+				break
+			}
+		}
+		return err
 	}
 }
 

pkg/sync/resync_releases.go

@@ -67,13 +67,29 @@ func (r resyncRelease) run() error {
 		Name: "upstream",
 		URL:  r.Upstream,
 	}
+	changes := false
+	changesDetected := func() error {
+		changes = true
+		return nil
+	}
 	return runSteps([]step{
 		r.checkoutAs(downstreamRemote, downstreamBranch, syncBranch),
 		r.mergeUpstream(upstreamBranch, syncBranch, []step{
 			r.checkoutAs(upstreamRemote, upstreamBranch, syncBranch),
-			r.pushBranch(syncBranch),
-			r.createSyncReleasePR(downstreamBranch, upstreamBranch, syncBranch),
+			changesDetected,
 		}),
+		r.checkoutAs(upstreamRemote, upstreamBranch, syncBranch),
+		r.generateImages(r.rel),
+		r.commitChanges(r.ImagesGenerated, changesDetected),
+		func() error {
+			if !changes {
+				return nil
+			}
+			return multiStep{
+				r.pushBranch(syncBranch),
+				r.createSyncReleasePR(downstreamBranch, upstreamBranch, syncBranch),
+			}.runSteps()
+		},
 	})
 }