Merge pull request #134 from sclorg/fix_fork_issue

Fix fork issue
sclorg · Nov 26, 2024 · c51017e · c51017e
2 parents 9ecd429 + 579572d
commit c51017e
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/.github/workflows/build-and-push.yml b/.github/workflows/build-and-push.yml
@@ -20,7 +20,7 @@ jobs:
         with:
           dockerfiles: ./Dockerfile
           image: betka
-          tags: latest 1 ${{ github.sha }} 0.9.7
+          tags: latest 1 ${{ github.sha }} 0.9.8
 
       - name: Push betka image to Quay.io
         id: push-to-quay

diff --git a/Dockerfile b/Dockerfile
@@ -1,7 +1,7 @@
 FROM quay.io/fedora/fedora:37
 
 ENV NAME=betka-fedora \
-    RELEASE=0.9.7 \
+    RELEASE=0.9.8 \
     ARCH=x86_64 \
     SUMMARY="Syncs changes from upstream repository to downstream" \
     DESCRIPTION="Syncs changes from upstream repository to downstream" \

diff --git a/betka/gitlab.py b/betka/gitlab.py
@@ -395,15 +395,15 @@ def create_gitlab_merge_request(
         :param branch: ?
         :return:
         """
-        logger.debug(f"create_gitlab_merge_pull_request(): {branch}")
+        logger.debug(f"create_gitlab_merge_pull_request(): {branch}. Is fork enabled? {self.is_fork_enabled()}")
         data = {
             "title": title,
             "target_branch": branch,
             "source_branch": branch,
             "description": desc_msg,
             "target_project_id": self.project_id,
         }
-        if not self.betka_config["use_gitlab_forks"]:
+        if not self.is_fork_enabled():
             data["target_branch"] = origin_branch
         return self.create_project_mergerequest(data)
 

diff --git a/setup.py b/setup.py
@@ -14,7 +14,7 @@ def get_requirements():
 
 setup(
     name="betka",
-    version="0.9.7",
+    version="0.9.8",
     packages=find_packages(exclude=["examples", "tests"]),
     url="https://github.com/sclorg/betka",
     license="GPLv3+",