diff --git a/build/ci/.build-container.yml b/build/ci/.build-container.yml index 25c44840c04a8f02d236e179742874ee1570592c..8bf61180f5b8ceccf4055264aa890ed8c7e262f6 100644 --- a/build/ci/.build-container.yml +++ b/build/ci/.build-container.yml @@ -1,4 +1,5 @@ variables: + ACTIVE_DEVELOP: "v.0.1.0-codename-threadbare" DOCKER_IMAGE_SHA: $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA build:docker: @@ -6,7 +7,7 @@ build:docker: tags: - baremetal rules: - - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == $CI_DEFAULT_BRANCH + - if: $CI_COMMIT_BRANCH == $ACTIVE_DEVELOP - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH script: - > @@ -31,7 +32,7 @@ deploy:develop: TAG: $CI_REGISTRY_IMAGE:develop HOOK: $PORTAINER_HOOK_DEVELOP rules: - - if: $CI_COMMIT_BRANCH == "v.0.1.0-codename-threadbare" + - if: $CI_COMMIT_BRANCH == $ACTIVE_DEVELOP <<: *deploy deploy:tagged: