From 3e5889394a5ce4b76793dd1ade33c1d3101b2cd1 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@fakecake.org>
Date: Thu, 22 May 2025 20:50:46 +0300
Subject: [PATCH] use generic push commit job

---
 .gitlab-ci.yml | 22 ++++------------------
 1 file changed, 4 insertions(+), 18 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5f3ca081c..9251a0da3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -42,15 +42,8 @@ ttrss-fpm-pgsql-static:build:
     DOCKERFILE: ${CI_PROJECT_DIR}/.docker/app/Dockerfile
     IMAGE_TAR: ${IMAGE_TAR_FPM}
 
-ttrss-fpm-pgsql-static:push-master-commit-only-gitlab:
-  extends: .crane-image-registry-push-master-commit-only-gitlab
-  variables:
-    IMAGE_TAR: ${IMAGE_TAR_FPM}
-  needs:
-    - job: ttrss-fpm-pgsql-static:build
-
-ttrss-fpm-pgsql-static:push-branch-gitlab:
-  extends: .crane-image-registry-push-branch-gitlab
+ttrss-fpm-pgsql-static:push-commit-only-gitlab:
+  extends: .crane-image-registry-push-commit-only-gitlab
   variables:
     IMAGE_TAR: ${IMAGE_TAR_FPM}
   needs:
@@ -62,15 +55,8 @@ ttrss-web-nginx:build:
     DOCKERFILE: ${CI_PROJECT_DIR}/.docker/web-nginx/Dockerfile
     IMAGE_TAR: ${IMAGE_TAR_WEB}
 
-ttrss-web-nginx:push-master-commit-only-gitlab:
-  extends: .crane-image-registry-push-master-commit-only-gitlab
-  variables:
-    IMAGE_TAR: ${IMAGE_TAR_WEB}
-  needs:
-    - job: ttrss-web-nginx:build
-
-ttrss-web-nginx:push-branch-gitlab:
-  extends: .crane-image-registry-push-branch-gitlab
+ttrss-web-nginx:push-commit-only-gitlab:
+  extends: .crane-image-registry-push-commit-only-gitlab
   variables:
     IMAGE_TAR: ${IMAGE_TAR_WEB}
   needs: