diff --git a/gitlab/deploy-maven.yml b/gitlab/deploy-maven.yml index 01488ca0..7c67363b 100644 --- a/gitlab/deploy-maven.yml +++ b/gitlab/deploy-maven.yml @@ -4,7 +4,7 @@ build_kotlin: - m4 rules: - if: "$CI_COMMIT_TAG" - - if: '$CI_COMMIT_BRANCH == "master"' + - if: '$CI_COMMIT_BRANCH == "main"' script: - task build:kotlin artifacts: @@ -50,7 +50,7 @@ publish_snapshot_to_maven: - job: build_kotlin artifacts: true rules: - - if: '$CI_COMMIT_BRANCH == "master"' + - if: '$CI_COMMIT_BRANCH == "main"' when: manual script: - cd libs/gl-sdk-android diff --git a/gitlab/functions.yml b/gitlab/functions.yml index 2a9a2ad6..c02b1f49 100644 --- a/gitlab/functions.yml +++ b/gitlab/functions.yml @@ -27,7 +27,7 @@ build_ci_image: changes: paths: - docker/ci.Dockerfile - compare_to: master + compare_to: main script: - docker pull ${CI_IMAGE}:latest || true - export IMAGE_TAG=${CI_COMMIT_SHORT_SHA}-$(date +%Y%m%d)