summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuillaume Jacquart <guillaume.jacquart@hoodbrains.com>2023-07-11 07:09:26 +0000
committerGuillaume Jacquart <guillaume.jacquart@hoodbrains.com>2023-07-11 07:09:26 +0000
commitc58614d7ccea3462b62c51bfb7f547af2cc7fbcd (patch)
tree999cafb34a2cc132ffd8d4a91ff00ea2bc45df51
parent8b1855bce1313ad84df8f96efdbb62e2acf7ff33 (diff)
chore: build release only on tags starting with eOS-
-rw-r--r--.gitlab-ci.yml18
-rw-r--r--build.gradle2
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,
],
]