diff options
| author | Guillaume Jacquart <guillaume.jacquart@hoodbrains.com> | 2022-02-21 20:20:43 +0000 |
|---|---|---|
| committer | Guillaume Jacquart <guillaume.jacquart@hoodbrains.com> | 2022-02-21 20:20:43 +0000 |
| commit | a80f529d4b14a6820cf2b7d47b1087e9d06f0ae8 (patch) | |
| tree | 196eacef8231fea58703744917a0d56894071684 /.gitlab-ci.yml | |
| parent | aa24315969cebf4ee10baecb761947f80f3042cc (diff) | |
| parent | 9d63c322d2a79c8bd8308997368976a69037149e (diff) | |
Merge branch 'e_trackers_list' into 'main'
Use embeded E-trackers list, #4600
See merge request e/privacy-central/privacycentralapp!14
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b61aa3e..063dd65 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -85,16 +85,16 @@ test-debug: build-full: stage: build script: - - ./gradlew build + - ./gradlew assembleDebug assembleRelease rules: - if: '$CI_PIPELINE_SOURCE == "schedule"' when: never - - if: '$CI_COMMIT_BRANCH == "master"' + - if: '$CI_COMMIT_BRANCH == "main"' variables: MAPBOX_KEY: $MAPBOX_KEY_PROD MAPBOX_SECRET_KEY: $MAPBOX_SECRET_KEY_PROD when: always - - if: '$CI_PIPELINE_SOURCE == "merge_request_event" && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "master"' + - if: '$CI_PIPELINE_SOURCE == "merge_request_event" && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "main"' when: always - when: never artifacts: |