From 5b31353c5dd1724f2c9c07a0c7a021106c64db72 Mon Sep 17 00:00:00 2001 From: jastornig Date: Tue, 19 Dec 2023 16:10:14 +0000 Subject: [PATCH] Update .gitlab-ci.yml file --- .gitlab-ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 375770d..74b0a2b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -25,9 +25,9 @@ build_job: image: "reactnativecommunity/react-native-android:latest" stage: build # This job runs in the build stage, which runs first. rules: - - if: $COMMIT_BRANCH == "main" + - if: $COMMIT_BRANCH == "main" || $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "main" when: manual - - if: $COMMIT_BRANCH != "main" + - if: $COMMIT_BRANCH != "main" || $CI_MERGE_REQUEST_TARGET_BRANCH_NAME != "main" when: never script: - echo BUILD_JOB_ID=$CI_JOB_ID >> environment.env @@ -56,9 +56,9 @@ release_job: needs: - job: build_job rules: - - if: $COMMIT_BRANCH == "main" + - if: $COMMIT_BRANCH == "main" || $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "main" when: manual - - if: $COMMIT_BRANCH != "main" + - if: $COMMIT_BRANCH != "main" || $CI_MERGE_REQUEST_TARGET_BRANCH_NAME != "main" when: never release: