catdog2/pelican-deployment-system
1
0
Fork 0
mirror of https://github.com/IEEE-SB-Passau/pelican-deployment-system.git synced 2017-09-06 16:35:38 +02:00
Code Activity

improve repo update, apply more force, submodules suck

Browse Source
This commit is contained in:
Peter Dahlberg
2016-06-10 23:34:06 +02:00
parent 3d5d70cfd0
commit 67c9a61f21
1 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
pelican_deploy/deploy.py
View File

@@ -16,6 +16,7 @@ OUTPUT_DIR = "output"
class DeploymentRunner: class DeploymentRunner:
def __init__(self, name, runner_config): def __init__(self, name, runner_config):
self.name = name self.name = name
self.working_directory = Path(runner_config["working_directory"]) self.working_directory = Path(runner_config["working_directory"])
@@ -45,7 +46,7 @@ class DeploymentRunner:
build_repo = Repo(str(self.build_repo_path)) build_repo = Repo(str(self.build_repo_path))
except (InvalidGitRepositoryError, NoSuchPathError) as e: except (InvalidGitRepositoryError, NoSuchPathError) as e:
if not self.build_repo_path.is_dir() or \ if self.build_repo_path.is_dir() and \
next(self.build_repo_path.iterdir(), None) is not None: next(self.build_repo_path.iterdir(), None) is not None:
log.error("non-empty %s exists but not a valid git repository!", log.error("non-empty %s exists but not a valid git repository!",
self.build_repo_path) self.build_repo_path)
@@ -56,13 +57,23 @@ class DeploymentRunner:
str(self.build_repo_path), str(self.build_repo_path),
branch=self.git_branch) branch=self.git_branch)
if build_repo.remotes.origin.url != self.clone_url:
cw = build_repo.remotes.origin.config_writer
cw.set("url", self.clone_url)
cw.release()
build_repo.head.reference = build_repo.create_head(self.git_branch) build_repo.head.reference = build_repo.create_head(self.git_branch)
assert not build_repo.head.is_detached assert not build_repo.head.is_detached
# deinit submodules to avoid removed ones dangling around later
# they should stay around in .git, so reinit should be fast
build_repo.git.submodule("deinit", ".")
build_repo.remotes.origin.pull( build_repo.remotes.origin.pull(
force=True, force=True,
no_edit=True, no_edit=True,
refspec="+{b}:{b}".format(b=self.git_branch)) refspec="+{b}:{b}".format(b=self.git_branch),
recurse_submodules="yes")
# forcefully reset the working tree # forcefully reset the working tree
build_repo.head.reset(index=True, working_tree=True) build_repo.head.reset(index=True, working_tree=True)
@@ -71,6 +82,9 @@ class DeploymentRunner:
except: except:
log.warning("git clean failed!", exc_info=True) log.warning("git clean failed!", exc_info=True)
# update the submodules
build_repo.git.submodule("update", "--init", "--force", "--recursive")
def build(self, abort_running=False): def build(self, abort_running=False):
with self._build_lock: with self._build_lock:
if abort_running: if abort_running: