diff options
| -rw-r--r-- | .gitlab-ci.yml | 31 |
1 files changed, 22 insertions, 9 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1e340107a..7002d519c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -2,6 +2,7 @@ stages: - lint - build - test + - publish variables: ESLINT_PATHS: js plugins @@ -26,23 +27,23 @@ eslint: phpstan: extends: .phpstan -ttrss-web-nginx: - extends: .build-master-commit-only - variables: - DOCKERFILE: ${CI_PROJECT_DIR}/.docker/web-nginx/Dockerfile - ttrss-web-nginx:branch: extends: .build-branch variables: DOCKERFILE: ${CI_PROJECT_DIR}/.docker/web-nginx/Dockerfile -ttrss-fpm-pgsql-static: - extends: .build-master-commit-only +ttrss-fpm-pgsql-static:branch: + extends: .build-branch variables: DOCKERFILE: ${CI_PROJECT_DIR}/.docker/app/Dockerfile -ttrss-fpm-pgsql-static:branch: - extends: .build-branch +ttrss-web-nginx: + extends: .build-master-commit-only + variables: + DOCKERFILE: ${CI_PROJECT_DIR}/.docker/web-nginx/Dockerfile + +ttrss-fpm-pgsql-static: + extends: .build-master-commit-only variables: DOCKERFILE: ${CI_PROJECT_DIR}/.docker/app/Dockerfile @@ -68,3 +69,15 @@ integration-test: extends: .integration-test rules: - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH + +ttrss-web-nginx:publish: + stage: publish + extends: .build-master + variables: + DOCKERFILE: ${CI_PROJECT_DIR}/.docker/web-nginx/Dockerfile + +ttrss-fpm-pgsql-static:publish: + stage: publish + extends: .build-master + variables: + DOCKERFILE: ${CI_PROJECT_DIR}/.docker/app/Dockerfile |