Merge branch '2023.11' into 2024.11

tine-groupware · Jan 31, 2024 · 147ac16 · 147ac16
2 parents c421b96 + 291272d
commit 147ac16
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 14 deletions.
diff --git a/ci/gitlab-ci/lib.yml b/ci/gitlab-ci/lib.yml
@@ -711,13 +711,7 @@
                       return 1
               fi
       
-              if [ "$(echo "${branch}" | cut -d. -f1)" -lt 2023 ]; then
-                  echo tine20.org
-                  return
-              fi
-      
-              echo tine20.com
-              return
+              echo tine20.org
           else
               if [ $(echo "${branch}" | awk -F"/" '{print NF-1}') != 1 ]; then
                       return 1

diff --git a/ci/gitlab-ci/lib/scripts/repo.sh b/ci/gitlab-ci/lib/scripts/repo.sh
@@ -15,13 +15,7 @@ repo_get_customer_for_branch () {
                 return 1
         fi
 
-        if [ "$(echo "${branch}" | cut -d. -f1)" -lt 2023 ]; then
-            echo tine20.org
-            return
-        fi
-
-        echo tine20.com
-        return
+        echo tine20.org
     else
         if [ $(echo "${branch}" | awk -F"/" '{print NF-1}') != 1 ]; then
                 return 1