Skip to content

Commit b2304ed

Browse files
committed
improving logging with git status for auto-bump
1 parent f0c2c50 commit b2304ed

File tree

1 file changed

+35
-0
lines changed

1 file changed

+35
-0
lines changed

pkg/auto/chart_bump.go

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -240,6 +240,11 @@ func (b *Bump) BumpChart(ctx context.Context) error {
240240
return err
241241
}
242242

243+
if err := git.Status(ctx); err != nil {
244+
logger.Log(ctx, slog.LevelError, "error while checking git status", logger.Err(err))
245+
return err
246+
}
247+
243248
if err := git.AddAndCommit("make prepare"); err != nil {
244249
logger.Log(ctx, slog.LevelError, "error while adding and committing after make prepare", logger.Err(err))
245250
return err
@@ -253,6 +258,11 @@ func (b *Bump) BumpChart(ctx context.Context) error {
253258
}
254259
}
255260

261+
if err := git.Status(ctx); err != nil {
262+
logger.Log(ctx, slog.LevelError, "error while checking git status", logger.Err(err))
263+
return err
264+
}
265+
256266
if clean, _ := git.StatusProcelain(ctx); !clean {
257267
logger.Log(ctx, slog.LevelDebug, "git is not clean - icon downloaded")
258268
if err := git.AddAndCommit("make icon"); err != nil {
@@ -272,6 +282,11 @@ func (b *Bump) BumpChart(ctx context.Context) error {
272282
return err
273283
}
274284

285+
if err := git.Status(ctx); err != nil {
286+
logger.Log(ctx, slog.LevelError, "error while checking git status", logger.Err(err))
287+
return err
288+
}
289+
275290
if clean, _ := git.StatusProcelain(ctx); !clean {
276291
if err := git.AddAndCommit("make patch"); err != nil {
277292
return err
@@ -284,12 +299,22 @@ func (b *Bump) BumpChart(ctx context.Context) error {
284299
return err
285300
}
286301

302+
if err := git.Status(ctx); err != nil {
303+
logger.Log(ctx, slog.LevelError, "error while checking git status", logger.Err(err))
304+
return err
305+
}
306+
287307
// make charts - generate new assets and charts overwriting logo
288308
if err := b.Pkg.GenerateCharts(ctx, b.configOptions.OmitBuildMetadataOnExport); err != nil {
289309
logger.Log(ctx, slog.LevelError, "error while generating charts", logger.Err(err))
290310
return err
291311
}
292312

313+
if err := git.Status(ctx); err != nil {
314+
logger.Log(ctx, slog.LevelError, "error while checking git status", logger.Err(err))
315+
return err
316+
}
317+
293318
if clean, _ := git.StatusProcelain(ctx); clean {
294319
logger.Log(ctx, slog.LevelError, "make charts did not generate any changes")
295320
return errors.New("make charts did not generate any changes")
@@ -318,12 +343,22 @@ func (b *Bump) BumpChart(ctx context.Context) error {
318343
}
319344
}
320345

346+
if err := git.Status(ctx); err != nil {
347+
logger.Log(ctx, slog.LevelError, "error while checking git status", logger.Err(err))
348+
return err
349+
}
350+
321351
// modify the release.yaml
322352
if err := b.updateReleaseYaml(ctx, targetCharts); err != nil {
323353
logger.Log(ctx, slog.LevelError, "error while updating release.yaml", logger.Err(err))
324354
return err
325355
}
326356

357+
if err := git.Status(ctx); err != nil {
358+
logger.Log(ctx, slog.LevelError, "error while checking git status", logger.Err(err))
359+
return err
360+
}
361+
327362
if clean, _ := git.StatusProcelain(ctx); clean {
328363
logger.Log(ctx, slog.LevelError, "update release.yaml did not generate any changes")
329364
return errors.New("update release.yaml did not generate any changes")

0 commit comments

Comments
 (0)