~comcloudway/builds.sr.ht

a17b30c654fdac332a835c07d4dd782d92cb37c4 — Michael Forney 5 years ago a988c60
Fetch submodules regardless of whether the repo has a ref attached

Since 20aa65c0ee, instead of cloning with --recursive, submodules are
updated after the correct ref is checked out. However, it was doing so
*only* when a ref is specified.
1 files changed, 9 insertions(+), 9 deletions(-)

M worker/tasks.go
M worker/tasks.go => worker/tasks.go +9 -9
@@ 343,15 343,15 @@ func (ctx *JobContext) CloneRepos() error {
				if err := git.Run(); err != nil {
					return errors.Wrap(err, "git checkout")
				}
				git = ctx.SSH("GIT_SSH_COMMAND='ssh -o " +
					"UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no'",
					"sh", "-euxc",
					fmt.Sprintf("'cd %s && git submodule update --init'", repo_name))
				git.Stdout = ctx.LogFile
				git.Stderr = ctx.LogFile
				if err := git.Run(); err != nil {
					return errors.Wrap(err, "git submodule update")
				}
			}
			git = ctx.SSH("GIT_SSH_COMMAND='ssh -o " +
				"UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no'",
				"sh", "-euxc",
				fmt.Sprintf("'cd %s && git submodule update --init'", repo_name))
			git.Stdout = ctx.LogFile
			git.Stderr = ctx.LogFile
			if err := git.Run(); err != nil {
				return errors.Wrap(err, "git submodule update")
			}
		} else if scm == "hg" {
			repo_name := path.Base(purl.Path)