diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 74b0a2b..2678d80 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -25,10 +25,8 @@ 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" || $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "main" + - if: $COMMIT_BRANCH == $CI_DEFAULT_BRANCH || $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == $CI_DEFAULT_BRANCH when: manual - - if: $COMMIT_BRANCH != "main" || $CI_MERGE_REQUEST_TARGET_BRANCH_NAME != "main" - when: never script: - echo BUILD_JOB_ID=$CI_JOB_ID >> environment.env - yarn add expo @@ -46,7 +44,6 @@ build_job: dotenv: environment.env when: on_success expire_in: 60 days - when: manual @@ -56,11 +53,8 @@ release_job: needs: - job: build_job rules: - - if: $COMMIT_BRANCH == "main" || $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "main" + - if: $COMMIT_BRANCH == $CI_DEFAULT_BRANCH || $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == $CI_DEFAULT_BRANCH when: manual - - if: $COMMIT_BRANCH != "main" || $CI_MERGE_REQUEST_TARGET_BRANCH_NAME != "main" - when: never - release: tag_name: 'v0.$CI_PIPELINE_IID' description: 'v0.$CI_PIPELINE_IID create by pipeline'