diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 39d12f7db072d0e8c9fa73ebd21d8000a1e211b0..1930fff9c11a2f7ab6cc629cd7fe2875afdee534 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -251,13 +251,13 @@ coverity_scan: key: prefix: linux64 -.master_rules: +.dev_rules: rules: - if: $BUILD_CHANNEL || $CI_COMMIT_TAG when: never - if: '$CI_PIPELINE_SOURCE == "web"' - if: '$CI_PIPELINE_SOURCE == "schedule"' - #- if: '$CI_COMMIT_BRANCH == "master" && $CI_PIPELINE_SOURCE == "push"' + #- if: '$CI_COMMIT_BRANCH == "main" && $CI_PIPELINE_SOURCE == "push"' # when: delayed # start_in: '12 hours' variables: @@ -285,25 +285,25 @@ coverity_scan: variables: VIEWER_CHANNEL_TYPE: Release -build:master:linux64: +build:dev:linux64: extends: - .linux64_build - - .master_rules + - .dev_rules -build:master:mac64: +build:dev:mac64: extends: - .mac64_build - - .master_rules + - .dev_rules -.build:master:windows32: +.build:dev:windows32: extends: - .win32_build - - .master_rules + - .dev_rules -build:master:windows64: +build:dev:windows64: extends: - .win64_build - - .master_rules + - .dev_rules build:project:linux64: extends: