From 35d8aa1adbc7b3bdbb6cb54863971d3e501072cd Mon Sep 17 00:00:00 2001
From: Pierre Ozoux <pierre@ozoux.net>
Date: Tue, 1 Nov 2022 15:34:15 +0000
Subject: [PATCH 1/2] Adds possibility to skip visio url.

---
 base/apps/indie_external/lib/SitesManager.php | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/base/apps/indie_external/lib/SitesManager.php b/base/apps/indie_external/lib/SitesManager.php
index 0675f29..00e8aaf 100644
--- a/base/apps/indie_external/lib/SitesManager.php
+++ b/base/apps/indie_external/lib/SitesManager.php
@@ -171,7 +171,7 @@ class SitesManager {
 
 			if ($site['name'] === 'Chat') {
 				$chat_url = getenv('CHAT_URL', true) ?: getenv('CHAT_URL');
-				if (!$chat_url) {
+				if (!$chat_url) { // if CHAT_URL is empty or false, continue the loop and skip this item
 					continue;
 				} else {
 					$site['url'] = str_replace(['{chat_url}'], [$chat_url], $site['url']);
@@ -188,8 +188,12 @@ class SitesManager {
 			
 			if ($site['name'] === 'Visio') {
 				$visio_url = getenv('VISIO_URL', true) ?: getenv('VISIO_URL');
-				if ($visio_url) {
-					$site['url'] = $visio_url;
+				if ($visio_url !== '') { // if VISIO_URL is empty, we use the default provided in the json 
+					if ($visio_url == 'false') { // if VISIO_URL is 'false', continue the loop and skip this item
+						continue;
+					} else {
+						$site['url'] = $visio_url;
+					}
 				}
 			}
 
-- 
GitLab


From c45618e1c3ec6d1b5b114e2231a4f1f0c242a4c8 Mon Sep 17 00:00:00 2001
From: Pierre Ozoux <pierre@ozoux.net>
Date: Tue, 1 Nov 2022 15:49:50 +0000
Subject: [PATCH 2/2] Exclude rc versions.

---
 ci/functions | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ci/functions b/ci/functions
index e77e579..3b184eb 100644
--- a/ci/functions
+++ b/ci/functions
@@ -1,6 +1,6 @@
 function prepare_env() {
   curl https://api.github.com/repos/nextcloud/server/tags?per_page=50 > /tmp/tags
-  export MINOR_VERSION=`cat /tmp/tags | jq '.[] | select(.name|test("v'${MARKETTING_VERSION}'.")).name'  | head -n1 | cut -d\" -f2 | cut -c2-`
+  export MINOR_VERSION=`cat /tmp/tags | jq '.[] | select(.name|test(".rc.")|not) |select(.name|test("v'${MARKETTING_VERSION}'.")).name'  | head -n1 | cut -d\" -f2 | cut -c2-`
   export PATCH_NUMBER=`curl https://raw.githubusercontent.com/nextcloud/server/v${MINOR_VERSION}/version.php | grep '$OC_Version =' | cut -d, -f4 | cut -d] -f1 | xargs`
   echo "MARKETTING_VERSION=$MARKETTING_VERSION"
   echo "MINOR_VERSION=$MINOR_VERSION"
-- 
GitLab