From 3aade0897751c194370b49790fdd8f7787cc822b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Erik=20Pedersen?= Date: Sat, 24 Jun 2017 09:18:57 +0200 Subject: [PATCH] releaser: Improve docs submodule handling Still not optimal. --- releaser/releaser.go | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/releaser/releaser.go b/releaser/releaser.go index 0823cd04e..39a785da2 100644 --- a/releaser/releaser.go +++ b/releaser/releaser.go @@ -142,9 +142,17 @@ func (r *ReleaseHandler) Run() error { } if r.shouldPrepareVersions() { - // Make sure the docs submodule is up to date. - if _, err := git("submodule", "update", "--remote", "--merge"); err != nil { - return err + if newVersion.PatchLevel == 0 { + // Make sure the docs submodule is up to date. + // TODO(bep) improve this. Maybe it was not such a good idea to do + // this in the sobmodule directly. + if _, err := git("submodule", "update", "--init"); err != nil { + return err + } + //git submodule update + if _, err := git("submodule", "update", "--remote", "--merge"); err != nil { + return err + } } // TODO(bep) the above may not have changed anything. if _, err := git("commit", "-a", "-m", fmt.Sprintf("%s Update /docs [ci skip]", commitPrefix)); err != nil {