From c2d4531e82f2b74c4c7ed8fc8c81c5e729fe2405 Mon Sep 17 00:00:00 2001
From: jastornig <jastornig@edu.aau.at>
Date: Wed, 20 Dec 2023 22:14:24 +0000
Subject: [PATCH] Update .gitlab-ci.yml file

---
 .gitlab-ci.yml | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index afc45b0..b868c5b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -25,9 +25,7 @@ build_job:
   image: "reactnativecommunity/react-native-android:latest"
   stage: build # This job runs in the build stage, which runs first.
   rules:
-    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
-      when: manual
-    - if: $CI_MERGE_REQUEST_TARGET_BRANCH_PROTECTED
+    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && $CI_PIPELINE_SOURCE == "push"
       when: manual
   script:
     - echo BUILD_JOB_ID=$CI_JOB_ID >> environment.env
@@ -55,9 +53,7 @@ release_job:
   needs:
     - job: build_job
   rules:
-    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
-      when: on_success
-    - if: $CI_MERGE_REQUEST_TARGET_BRANCH_PROTECTED
+    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && $CI_PIPELINE_SOURCE == "push"
       when: on_success
   release:
     tag_name: 'v0.$CI_PIPELINE_IID'