From 14f2c7133d0d35b66e4e035145d6253d50a10046 Mon Sep 17 00:00:00 2001
From: Benjamin Gaussorgues <benjamin.gaussorgues@nextcloud.com>
Date: Fri, 13 Sep 2024 16:28:14 +0200
Subject: [PATCH] Always deploy beta to all instances

Signed-off-by: Benjamin Gaussorgues <benjamin.gaussorgues@nextcloud.com>
---
 build/config_builder |  7 ++++---
 config/config.php    | 16 ++++++++++++++++
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/build/config_builder b/build/config_builder
index d606cc9c..24b7efa4 100755
--- a/build/config_builder
+++ b/build/config_builder
@@ -60,15 +60,16 @@ foreach ($releases as $releaseName => $info) {
 	if (isset($latestReleases[$stability][$previousMajor])) {
 		$upgradeFrom = $latestReleases[$stability][$previousMajor];
 		$generatedConfig[$stability][$upgradeFrom][$deployPercent] = $generatedConfig[$stability][$major]['100'];
-	} elseif (isset($latestReleases['stable'][$major -1])) {
+	} elseif (isset($latestReleases['stable'][$previousMajor])) {
 		$upgradeFrom = $latestReleases['stable'][$previousMajor];
 		$generatedConfig[$stability][$upgradeFrom][$deployPercent] = $generatedConfig[$stability][$major]['100'];
 	}
 
 	// For stable versions, check if we can upgrade from a beta version
+	// Beta version are always deployed at 100%
 	if ($stability === 'stable') {
-		if (isset($latestReleases['beta'][$previousMajor])) {
-			$upgradeFrom = $latestReleases['beta'][$previousMajor];
+		if (isset($latestReleases['beta'][$previousMajor]) || $deployPercent !== 100) {
+			$upgradeFrom = $latestReleases['beta'][$previousMajor] ?? $latestReleases['stable'][$previousMajor];
 			$generatedConfig['beta'][$upgradeFrom][100] = $generatedConfig[$stability][$major]['100'];
 		}
 	}
diff --git a/config/config.php b/config/config.php
index 11da96d5..7ebed34b 100644
--- a/config/config.php
+++ b/config/config.php
@@ -676,6 +676,22 @@
 		],
 	],
 	'beta' => [
+		'29.0.7.1' => [
+			'100' => [
+				'latest' => '30.0.0',
+				'internalVersion' => '30.0.0.14',
+				'downloadUrl' => 'https://download.nextcloud.com/server/releases/nextcloud-30.0.0.zip',
+				'web' => 'https://docs.nextcloud.com/server/30/admin_manual/maintenance/upgrade.html',
+				'eol' => false,
+				'minPHPVersion' => '8.1',
+				'signature' => 'QjU8BAz/b+ZSv1CFaom3VHE5IbT8giQgJ6/N00jPnWlRD8daXIsmIoLRe9UMl1yi
+hTRRW3r7MQCa6RklmtZIAxsoRYlk7eEdbogKTODLRe9gsXdXF2KFisADl6bcEw1H
+MLyVf7ncFnFlp9GYwpUEcGvJAzIcckkGTmBHAMTfmpSNQoijzdCP9ytKP2tJSe7h
+tOXDKB0sOYzsO5A725ERye0RKfgMY7TRG0vq9tIxB7ydSykxVAGglKHDwl/6mn5D
+NUfRJKep0nzpJXIOz+BiE6tTRxYMeRkUsI2WLPnPC3Ltu2Xl0u3iOoWaDfdD0Ox9
+XjOoUiZRQ+fUfAGTnEZ+Lg==',
+			],
+		],
 	],
 	'daily' => [
 		'30' => [