diff options
| -rw-r--r-- | .gitlab-ci.yml | 18 | ||||
| -rw-r--r-- | build.gradle | 2 |
2 files changed, 7 insertions, 13 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d9574df..d7374aa 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -77,6 +77,8 @@ test-debug: rules: - if: '$CI_PIPELINE_SOURCE == "schedule"' when: never + - if: '$CI_PIPELINE_SOURCE == "merge_request_event" && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "main"' + when: always - if: '$CI_COMMIT_BRANCH == "main"' when: never - if: '$CI_COMMIT_REF_PROTECTED == "true"' @@ -88,22 +90,14 @@ test-debug: paths: - ./**/build/reports/tests/testDebugUnitTest -build-full: +build-e-release: stage: build script: - - ./gradlew :app:assembleRelease + - ./gradlew :app:assembleERelease rules: - - if: '$CI_PIPELINE_SOURCE == "schedule"' - when: never - - if: '$CI_COMMIT_BRANCH == "main"' + - if: '$CI_COMMIT_REF_PROTECTED == "true" && $CI_BUILD_TAG =~ /^eOS-/' variables: - MAPBOX_KEY: $MAPBOX_KEY_PROD - when: always - - if: '$CI_COMMIT_REF_PROTECTED == "true"' - variables: - MAPBOX_KEY: $MAPBOX_KEY_PROD - when: always - - if: '$CI_PIPELINE_SOURCE == "merge_request_event" && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "main"' + MAPBOX_KEY: $MAPBOX_KEY_PROD when: always - when: never artifacts: diff --git a/build.gradle b/build.gradle index 824c306..7a0263e 100644 --- a/build.gradle +++ b/build.gradle @@ -27,7 +27,7 @@ buildscript { 'targetSdk' : 31, 'version' : [ 'major': 1, - 'minor': 13, + 'minor': 14, 'patch': 0, ], ] |