mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2025-04-26 06:54:49 +00:00
build_manifest: Make sure to respect GitLab currently built SHA
This commit is contained in:
parent
12d067f249
commit
d8ebbea1f0
1 changed files with 11 additions and 1 deletions
|
@ -186,8 +186,11 @@ def test_search_user_namespace():
|
||||||
|
|
||||||
def find_repository_sha(module: Tuple[str, int], branchname: str) -> Tuple[str, str]:
|
def find_repository_sha(module: Tuple[str, int], branchname: str) -> Tuple[str, str]:
|
||||||
namespace: str = os.environ["CI_PROJECT_NAMESPACE"]
|
namespace: str = os.environ["CI_PROJECT_NAMESPACE"]
|
||||||
project = search_user_namespace(namespace, module[0])
|
|
||||||
|
|
||||||
|
if module[0] == os.environ['CI_PROJECT_NAME']:
|
||||||
|
return 'user', os.environ['CI_COMMIT_SHA']
|
||||||
|
|
||||||
|
project = search_user_namespace(namespace, module[0])
|
||||||
# Find a fork in the User's namespace
|
# Find a fork in the User's namespace
|
||||||
if project:
|
if project:
|
||||||
id = project['id']
|
id = project['id']
|
||||||
|
@ -243,6 +246,13 @@ def test_find_repository_sha():
|
||||||
# This is now the sha of the last commit
|
# This is now the sha of the last commit
|
||||||
# assert git_ref == "master"
|
# assert git_ref == "master"
|
||||||
|
|
||||||
|
os.environ["CI_PROJECT_NAME"] = "the_project"
|
||||||
|
os.environ["CI_COMMIT_SHA"] = "MySha"
|
||||||
|
|
||||||
|
remote, git_ref = find_repository_sha(("the_project", 199), "whatever")
|
||||||
|
assert remote == "user"
|
||||||
|
assert git_ref == "MySha"
|
||||||
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
if __name__ == "__main__":
|
||||||
parser = argparse.ArgumentParser()
|
parser = argparse.ArgumentParser()
|
||||||
|
|
Loading…
Reference in a new issue