diff options
| author | Guillaume Jacquart <guillaume.jacquart@hoodbrains.com> | 2023-08-24 15:43:24 +0000 |
|---|---|---|
| committer | Guillaume Jacquart <guillaume.jacquart@hoodbrains.com> | 2023-08-24 15:43:24 +0000 |
| commit | 1a77e3924bc78eabca7b859ef62be30bbf2476ad (patch) | |
| tree | c97bf0282dec2acb39f858b83b35734350be357a | |
| parent | b153164c20449c78772860426b27cb4fe8466939 (diff) | |
| parent | dfba856de3734722d5627e3c1f617fa8ad2c6810 (diff) | |
Merge branch 'v1.15' into 'main'
chore: set v1.15 for /e/OS-1.15, fix ci script to auto build tagged commit.
See merge request e/os/advanced-privacy!145
| -rw-r--r-- | .gitlab-ci.yml | 2 | ||||
| -rw-r--r-- | build.gradle | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8aa5006..89a6f78 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -95,7 +95,7 @@ build-e-release: script: - ./gradlew :app:assembleERelease rules: - - if: '$CI_COMMIT_REF_PROTECTED == "true" && $CI_BUILD_TAG =~ /^eOS-/' + - if: '$CI_COMMIT_REF_PROTECTED == "true" && $CI_COMMIT_TAG =~ /^eOS-/' variables: MAPBOX_KEY: $MAPBOX_KEY_PROD when: always diff --git a/build.gradle b/build.gradle index 0db901b..a57ee21 100644 --- a/build.gradle +++ b/build.gradle @@ -27,7 +27,7 @@ buildscript { 'targetSdk' : 31, 'version' : [ 'major': 1, - 'minor': 14, + 'minor': 15, 'patch': 0, ], ] |