Skip to content
Snippets Groups Projects
Commit 6b5a73e5 authored by Pierre Ozoux's avatar Pierre Ozoux
Browse files

Merge branch 'feature-skip-visio-url' into 'master'

Adds possibility to skip visio url.

See merge request !18
parents 629d2d03 c45618e1
No related branches found
No related tags found
1 merge request!18Adds possibility to skip visio url.
Pipeline #1318 passed with stages
in 5 minutes and 33 seconds
......@@ -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;
}
}
}
......
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"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment