Skip to content
Snippets Groups Projects
Commit 9404b35c authored by r.jaepel's avatar r.jaepel
Browse files

Don't raise an issue if local study is ahead of remote

parent 62b7f558
No related branches found
No related tags found
No related merge requests found
......@@ -133,12 +133,11 @@ class BaseRepo:
f"{[branch.name for branch in correct_remote_branches]}")
remote_hash = str(correct_remote_branches[0].commit)
if self.current_commit_hash != remote_hash:
if remote_hash in self.log:
raise RuntimeError(
"Local repository is ahead of remote. This could be due to CADET-RDM version updates"
)
if self.current_commit_hash != remote_hash and remote_hash not in self.log:
return True
elif self.current_commit_hash != remote_hash and remote_hash in self.log:
print("Local repository is ahead of remote. This could be due to CADET-RDM version updates.")
return False
else:
return False
......
......@@ -13,36 +13,36 @@ if __name__ == '__main__':
"git@jugit.fz-juelich.de:r.jaepel/puetmann2013.git",
)
clr = Study(
WORK_DIR / 'clr',
"git@jugit.fz-juelich.de:j.schmoelder/clr.git",
branch="adapt_to_cadetrdm_runner"
)
flip_flow = Study(
WORK_DIR / 'flip_flow',
"git@jugit.fz-juelich.de:j.schmoelder/flip_flow.git",
branch="adapt_to_cadetrdm_runner"
)
serial_columns = Study(
WORK_DIR / 'serial_columns',
"git@jugit.fz-juelich.de:j.schmoelder/serial_columns.git",
# branch="adapt_to_cadetrdm_runner"
)
smb = Study(
WORK_DIR / 'smb',
"git@jugit.fz-juelich.de:j.schmoelder/smb.git",
# branch="adapt_to_cadetrdm_runner"
)
# clr = Study(
# WORK_DIR / 'clr',
# "git@jugit.fz-juelich.de:j.schmoelder/clr.git",
# branch="adapt_to_cadetrdm_runner"
# )
#
# flip_flow = Study(
# WORK_DIR / 'flip_flow',
# "git@jugit.fz-juelich.de:j.schmoelder/flip_flow.git",
# branch="adapt_to_cadetrdm_runner"
# )
#
# serial_columns = Study(
# WORK_DIR / 'serial_columns',
# "git@jugit.fz-juelich.de:j.schmoelder/serial_columns.git",
# # branch="adapt_to_cadetrdm_runner"
# )
#
# smb = Study(
# WORK_DIR / 'smb',
# "git@jugit.fz-juelich.de:j.schmoelder/smb.git",
# # branch="adapt_to_cadetrdm_runner"
# )
studies = [
# puetmann2013,
puetmann2013,
# clr,
# flip_flow,
# serial_columns,
smb,
# smb,
]
force = False
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment