releaser: Try to fix the last failing step

diff --git a/releaser/releaser.go b/releaser/releaser.go
index 254bda5b3e0d7ccc87d60843ac960380144db9ae..f2244842ad35643c1468b87e96c68a3d0e34cee2 100644 (file)
--- a/releaser/releaser.go
+++ b/releaser/releaser.go
@@ -1,4 +1,4 @@
-// Copyright 2017-present The Hugo Authors. All rights reserved.
+// Copyright 2024 The Hugo Authors. All rights reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -92,6 +92,8 @@ func (r *ReleaseHandler) Run() error {
        mainVersion := newVersion
        mainVersion.PatchLevel = 0
 
+       r.gitPull()
+
        defer r.gitPush()
 
        if r.step == 1 {
@@ -178,6 +180,12 @@ func (r ReleaseHandler) calculateVersions() (hugo.Version, hugo.Version) {
        return newVersion, finalVersion
 }
 
+func (r *ReleaseHandler) gitPull() {
+       if _, err := r.git("pull", "origin", "HEAD"); err != nil {
+               log.Fatal("pull failed:", err)
+       }
+}
+
 func (r *ReleaseHandler) gitPush() {
        if r.skipPush {
                return