diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2a16c9d567520f25952beab8a277a1e8b335a360..a01379dbc80ae57df1f91f23bc754e8e38184353 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -102,14 +102,6 @@ build:env: # Build and push the CI image - docker build --cache-from ${CI_BUILD_IMAGE} -t ${CI_BUILD_IMAGE} --build-arg="BUILDKIT_INLINE_CACHE=1" --build-arg="CACHE_DIR=${BUILD_CACHE_DIR}" --build-arg="IMAGE_REGISTRY=${DOCKER_IMAGE_REGISTRY}" --build-arg="IONIC_CLI_VERSION=${IONIC_CLI_VERSION}" --build-arg="ANGULAR_CLI_VERSION=${ANGULAR_CLI_VERSION}" -f docker/build/Dockerfile . - docker push ${CI_BUILD_IMAGE} - rules: - - if: '$CI_COMMIT_BRANCH == "develop"' - changes: - - .gitlab-ci.yml - - docker/build/Dockerfile - - scripts/**/* - - package.json - - package-lock.json # --------------------------------------------------------------- # Build jobs @@ -141,8 +133,6 @@ build: extends: .build needs: ["build:env"] image: ${CI_BUILD_IMAGE} - only: - - develop build:feature: extends: .build