From 47312f65d99db298b508445fc71a26205f19e7b9 Mon Sep 17 00:00:00 2001
From: Oscar Krause <oscar.krause@collinwebdesigns.de>
Date: Thu, 29 Dec 2022 10:44:39 +0100
Subject: [PATCH] .gitlab-ci.yml improved

---
 .gitlab-ci.yml | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fb33db3..c3cc797 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -149,14 +149,15 @@ test:archlinux:
     - pacman -Sy
     - pacman -U --noconfirm *.pkg.tar.zst
 
-deploy:docker:
-  stage: deploy
+.deploy:
   rules:
     - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
-    - changes:
-        - Dockerfile
-        - requirements.txt
-        - app/**/*
+    - if: $CI_COMMIT_TAG
+      when: never
+
+deploy:docker:
+  extends: .deploy
+  stage: deploy
   before_script:
     - echo "COMMIT=${CI_COMMIT_SHA}" >> version.env
     - source version.env
@@ -177,10 +178,9 @@ deploy:docker:
 
 deploy:apt:
   # doc: https://git.collinwebdesigns.de/help/user/packages/debian_repository/index.md#install-a-package
+  extends: .deploy
   image: debian:bookworm-slim
   stage: deploy
-  rules:
-    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
   needs:
     - job: build:apt
       artifacts: true
@@ -217,13 +217,12 @@ deploy:apt:
     - 'curl --header "JOB-TOKEN: $CI_JOB_TOKEN" --upload-file ${EXPORT_NAME} "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/${PACKAGE_NAME}/${PACKAGE_VERSION}/${EXPORT_NAME}"'
 
 deploy:pacman:
+  extends: .deploy
   image: archlinux:base-devel
   stage: deploy
   needs:
     - job: build:pacman
       artifacts: true
-  rules:
-    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
   script:
     - source .PKGBUILD/PKGBUILD
     # fastapi-dls-1.0-1-any.pkg.tar.zst