fix(#6): env var GITLAB_CI is not set

SpikeeLabs · Jul 27, 2022 · 861e04e · 861e04e
1 parent be066ff
commit 861e04e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/gitflow_toolbox/common/get_current_gitlab.py b/gitflow_toolbox/common/get_current_gitlab.py
@@ -1,3 +1,5 @@
+import os
+
 import gitlab
 
 from gitflow_toolbox.common.get_env import get_env
@@ -10,7 +12,7 @@ def get_current_gitlab() -> gitlab.Gitlab:
         gitlab.Gitlab: current gitlab instance (or 'source', 'from' gitlab)
     """
     # If running in a gitlab CI job
-    if get_env("GITLAB_CI"):
+    if os.getenv("GITLAB_CI"):
         # Use provided token, if not available, use default token from job
         private_token = get_env("GITLAB_PRIVATE_TOKEN", "CI_JOB_TOKEN")
         return gitlab.Gitlab(get_env("CI_SERVER_URL"), private_token)

diff --git a/gitflow_toolbox/common/get_current_project.py b/gitflow_toolbox/common/get_current_project.py
@@ -1,3 +1,5 @@
+import os
+
 from gitlab.v4.objects.projects import Project
 
 from gitflow_toolbox.common.get_current_gitlab import get_current_gitlab
@@ -12,7 +14,7 @@ def get_current_project() -> Project:
     """
     gitlab = get_current_gitlab()
     # If running in a gitlab CI job
-    if get_env("GITLAB_CI"):
+    if os.getenv("GITLAB_CI"):
         # Use provided CI project, if not available, use project from current job
         project_id = get_env("GITLAB_PROJECT_ID", "CI_PROJECT_ID")
         return gitlab.projects.get(project_id)