xle/tt-rss
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'unprotected-phpunit'

Browse Source
This commit is contained in:
Andrew Dolgov
2025-05-22 20:53:16 +03:00
parent eb2ef63c46 a2a4e831cf
commit 3783d987e5
1 changed files with 10 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
.gitlab-ci.yml
View File

@@ -42,15 +42,8 @@ ttrss-fpm-pgsql-static:build:
DOCKERFILE: ${CI_PROJECT_DIR}/.docker/app/Dockerfile DOCKERFILE: ${CI_PROJECT_DIR}/.docker/app/Dockerfile
IMAGE_TAR: ${IMAGE_TAR_FPM} IMAGE_TAR: ${IMAGE_TAR_FPM}
ttrss-fpm-pgsql-static:push-master-commit-only: ttrss-fpm-pgsql-static:push-commit-only-gitlab:
extends: .crane-image-registry-push-master-commit-only extends: .crane-image-registry-push-commit-only-gitlab
variables:
IMAGE_TAR: ${IMAGE_TAR_FPM}
needs:
- job: ttrss-fpm-pgsql-static:build
ttrss-fpm-pgsql-static:push-branch:
extends: .crane-image-registry-push-branch
variables: variables:
IMAGE_TAR: ${IMAGE_TAR_FPM} IMAGE_TAR: ${IMAGE_TAR_FPM}
needs: needs:
@@ -62,15 +55,8 @@ ttrss-web-nginx:build:
DOCKERFILE: ${CI_PROJECT_DIR}/.docker/web-nginx/Dockerfile DOCKERFILE: ${CI_PROJECT_DIR}/.docker/web-nginx/Dockerfile
IMAGE_TAR: ${IMAGE_TAR_WEB} IMAGE_TAR: ${IMAGE_TAR_WEB}
ttrss-web-nginx:push-master-commit-only: ttrss-web-nginx:push-commit-only-gitlab:
extends: .crane-image-registry-push-master-commit-only extends: .crane-image-registry-push-commit-only-gitlab
variables:
IMAGE_TAR: ${IMAGE_TAR_WEB}
needs:
- job: ttrss-web-nginx:build
ttrss-web-nginx:push-branch:
extends: .crane-image-registry-push-branch
variables: variables:
IMAGE_TAR: ${IMAGE_TAR_WEB} IMAGE_TAR: ${IMAGE_TAR_WEB}
needs: needs:
@@ -124,13 +110,16 @@ phpunit-integration:
name: registry.fakecake.org/docker.io/postgres:15-alpine name: registry.fakecake.org/docker.io/postgres:15-alpine
alias: db alias: db
- &svc_app - &svc_app
name: registry.fakecake.org/cthulhoo/ttrss-fpm-pgsql-static:${CI_COMMIT_SHORT_SHA} name: ${CI_REGISTRY}/${CI_PROJECT_PATH}/ttrss-fpm-pgsql-static:${CI_COMMIT_SHORT_SHA}
alias: app alias: app
- &svc_web - &svc_web
name: registry.fakecake.org/cthulhoo/ttrss-web-nginx:${CI_COMMIT_SHORT_SHA} name: ${CI_REGISTRY}/${CI_PROJECT_PATH}/ttrss-web-nginx:${CI_COMMIT_SHORT_SHA}
alias: web-nginx alias: web-nginx
rules: rules:
- if: $CI_COMMIT_BRANCH && $REGISTRY_USER != null - if: $CI_COMMIT_BRANCH
needs:
- job: ttrss-fpm-pgsql-static:push-commit-only-gitlab
- job: ttrss-web-nginx:push-commit-only-gitlab
before_script: before_script:
# wait for everything to start # wait for everything to start
- | - |