fix(tool,nextcloud_test_presets): Fix version parsing considering doc…

…ker tags as pre-releases Signed-off-by: provokateurin <[email protected]>
nextcloud · Sep 20, 2024 · 82af61a · 82af61a
1 parent c8d9afd
commit 82af61a
Show file tree

Hide file tree

Showing 18 changed files with 25 additions and 16 deletions.
diff --git a/packages/nextcloud/packages/nextcloud_test_presets/docker/presets/cookbook/0.11 b/packages/nextcloud/packages/nextcloud_test_presets/docker/presets/cookbook/0.11
@@ -3,6 +3,6 @@ COOKBOOK_URL=https://github.com/christianlupus-nextcloud/cookbook-releases/relea
 DROP_ACCOUNT_URL=https://packages.framasoft.org/projects/nextcloud-apps/drop-account/drop_account-2.6.0.tar.gz
 NEWS_URL=https://github.com/nextcloud/news/releases/download/25.0.0-alpha8/news.tar.gz
 NOTES_URL=https://github.com/nextcloud-releases/notes/releases/download/v4.11.0/notes-v4.11.0.tar.gz
-SPREED_URL=https://github.com/nextcloud-releases/spreed/releases/download/v19.0.9/spreed-v19.0.9.tar.gz
+SPREED_URL=https://github.com/nextcloud-releases/spreed/releases/download/v20.0.0/spreed-v20.0.0.tar.gz
 TABLES_URL=https://github.com/nextcloud-releases/tables/releases/download/v0.8.0/tables-v0.8.0.tar.gz
 UPPUSH_URL=https://codeberg.org/NextPush/uppush/archive/1.5.1.tar.gz
diff --git a/packages/nextcloud/packages/nextcloud_test_presets/docker/presets/drop_account/2.5 b/packages/nextcloud/packages/nextcloud_test_presets/docker/presets/drop_account/2.5
@@ -1,4 +1,4 @@
-SERVER_VERSION=30.0.0-fpm-alpine@sha256:df40181b01e78e771484c6f7f6d43bcd2914f5792df5f0488bbb2acc1d26cf8f
+SERVER_VERSION=29.0.7-fpm-alpine@sha256:1ce452416b83d692e045b8a6eabf0171a15ea753d70e3fdf8cd197be40715929
 COOKBOOK_URL=https://github.com/christianlupus-nextcloud/cookbook-releases/releases/download/v0.11.2/cookbook-0.11.2.tar.gz
 DROP_ACCOUNT_URL=https://packages.framasoft.org/projects/nextcloud-apps/drop-account/drop_account-2.5.0.tar.gz
 NEWS_URL=https://github.com/nextcloud/news/releases/download/25.0.0-alpha8/news.tar.gz

diff --git a/packages/nextcloud/packages/nextcloud_test_presets/docker/presets/drop_account/2.6 b/packages/nextcloud/packages/nextcloud_test_presets/docker/presets/drop_account/2.6
@@ -3,6 +3,6 @@ COOKBOOK_URL=https://github.com/christianlupus-nextcloud/cookbook-releases/relea
 DROP_ACCOUNT_URL=https://packages.framasoft.org/projects/nextcloud-apps/drop-account/drop_account-2.6.0.tar.gz
 NEWS_URL=https://github.com/nextcloud/news/releases/download/25.0.0-alpha8/news.tar.gz
 NOTES_URL=https://github.com/nextcloud-releases/notes/releases/download/v4.11.0/notes-v4.11.0.tar.gz
-SPREED_URL=https://github.com/nextcloud-releases/spreed/releases/download/v19.0.9/spreed-v19.0.9.tar.gz
+SPREED_URL=https://github.com/nextcloud-releases/spreed/releases/download/v20.0.0/spreed-v20.0.0.tar.gz
 TABLES_URL=https://github.com/nextcloud-releases/tables/releases/download/v0.8.0/tables-v0.8.0.tar.gz
 UPPUSH_URL=https://codeberg.org/NextPush/uppush/archive/1.5.1.tar.gz
diff --git a/packages/nextcloud/packages/nextcloud_test_presets/docker/presets/news/25.0 b/packages/nextcloud/packages/nextcloud_test_presets/docker/presets/news/25.0
@@ -1,4 +1,4 @@
-SERVER_VERSION=30.0.0-fpm-alpine@sha256:df40181b01e78e771484c6f7f6d43bcd2914f5792df5f0488bbb2acc1d26cf8f
+SERVER_VERSION=29.0.7-fpm-alpine@sha256:1ce452416b83d692e045b8a6eabf0171a15ea753d70e3fdf8cd197be40715929
 COOKBOOK_URL=https://github.com/christianlupus-nextcloud/cookbook-releases/releases/download/v0.11.2/cookbook-0.11.2.tar.gz
 DROP_ACCOUNT_URL=https://packages.framasoft.org/projects/nextcloud-apps/drop-account/drop_account-2.6.0.tar.gz
 NEWS_URL=https://github.com/nextcloud/news/releases/download/25.0.0-alpha8/news.tar.gz

diff --git a/packages/nextcloud/packages/nextcloud_test_presets/docker/presets/notes/4.10 b/packages/nextcloud/packages/nextcloud_test_presets/docker/presets/notes/4.10
@@ -3,6 +3,6 @@ COOKBOOK_URL=https://github.com/christianlupus-nextcloud/cookbook-releases/relea
 DROP_ACCOUNT_URL=https://packages.framasoft.org/projects/nextcloud-apps/drop-account/drop_account-2.6.0.tar.gz
 NEWS_URL=https://github.com/nextcloud/news/releases/download/25.0.0-alpha8/news.tar.gz
 NOTES_URL=https://github.com/nextcloud-releases/notes/releases/download/v4.10.1/notes-v4.10.1.tar.gz
-SPREED_URL=https://github.com/nextcloud-releases/spreed/releases/download/v19.0.9/spreed-v19.0.9.tar.gz
+SPREED_URL=https://github.com/nextcloud-releases/spreed/releases/download/v20.0.0/spreed-v20.0.0.tar.gz
 TABLES_URL=https://github.com/nextcloud-releases/tables/releases/download/v0.8.0/tables-v0.8.0.tar.gz
 UPPUSH_URL=https://codeberg.org/NextPush/uppush/archive/1.5.1.tar.gz
diff --git a/packages/nextcloud/packages/nextcloud_test_presets/docker/presets/notes/4.11 b/packages/nextcloud/packages/nextcloud_test_presets/docker/presets/notes/4.11
@@ -3,6 +3,6 @@ COOKBOOK_URL=https://github.com/christianlupus-nextcloud/cookbook-releases/relea
 DROP_ACCOUNT_URL=https://packages.framasoft.org/projects/nextcloud-apps/drop-account/drop_account-2.6.0.tar.gz
 NEWS_URL=https://github.com/nextcloud/news/releases/download/25.0.0-alpha8/news.tar.gz
 NOTES_URL=https://github.com/nextcloud-releases/notes/releases/download/v4.11.0/notes-v4.11.0.tar.gz
-SPREED_URL=https://github.com/nextcloud-releases/spreed/releases/download/v19.0.9/spreed-v19.0.9.tar.gz
+SPREED_URL=https://github.com/nextcloud-releases/spreed/releases/download/v20.0.0/spreed-v20.0.0.tar.gz
 TABLES_URL=https://github.com/nextcloud-releases/tables/releases/download/v0.8.0/tables-v0.8.0.tar.gz
 UPPUSH_URL=https://codeberg.org/NextPush/uppush/archive/1.5.1.tar.gz
diff --git a/packages/nextcloud/packages/nextcloud_test_presets/docker/presets/notes/4.9 b/packages/nextcloud/packages/nextcloud_test_presets/docker/presets/notes/4.9
@@ -1,4 +1,4 @@
-SERVER_VERSION=30.0.0-fpm-alpine@sha256:df40181b01e78e771484c6f7f6d43bcd2914f5792df5f0488bbb2acc1d26cf8f
+SERVER_VERSION=29.0.7-fpm-alpine@sha256:1ce452416b83d692e045b8a6eabf0171a15ea753d70e3fdf8cd197be40715929
 COOKBOOK_URL=https://github.com/christianlupus-nextcloud/cookbook-releases/releases/download/v0.11.2/cookbook-0.11.2.tar.gz
 DROP_ACCOUNT_URL=https://packages.framasoft.org/projects/nextcloud-apps/drop-account/drop_account-2.6.0.tar.gz
 NEWS_URL=https://github.com/nextcloud/news/releases/download/25.0.0-alpha8/news.tar.gz

diff --git a/packages/nextcloud/packages/nextcloud_test_presets/docker/presets/server/30.0 b/packages/nextcloud/packages/nextcloud_test_presets/docker/presets/server/30.0
@@ -3,6 +3,6 @@ COOKBOOK_URL=https://github.com/christianlupus-nextcloud/cookbook-releases/relea
 DROP_ACCOUNT_URL=https://packages.framasoft.org/projects/nextcloud-apps/drop-account/drop_account-2.6.0.tar.gz
 NEWS_URL=https://github.com/nextcloud/news/releases/download/25.0.0-alpha8/news.tar.gz
 NOTES_URL=https://github.com/nextcloud-releases/notes/releases/download/v4.11.0/notes-v4.11.0.tar.gz
-SPREED_URL=https://github.com/nextcloud-releases/spreed/releases/download/v19.0.9/spreed-v19.0.9.tar.gz
+SPREED_URL=https://github.com/nextcloud-releases/spreed/releases/download/v20.0.0/spreed-v20.0.0.tar.gz
 TABLES_URL=https://github.com/nextcloud-releases/tables/releases/download/v0.8.0/tables-v0.8.0.tar.gz
 UPPUSH_URL=https://codeberg.org/NextPush/uppush/archive/1.5.1.tar.gz
diff --git a/packages/nextcloud/packages/nextcloud_test_presets/docker/presets/spreed/19.0 b/packages/nextcloud/packages/nextcloud_test_presets/docker/presets/spreed/19.0
@@ -1,4 +1,4 @@
-SERVER_VERSION=30.0.0-fpm-alpine@sha256:df40181b01e78e771484c6f7f6d43bcd2914f5792df5f0488bbb2acc1d26cf8f
+SERVER_VERSION=29.0.7-fpm-alpine@sha256:1ce452416b83d692e045b8a6eabf0171a15ea753d70e3fdf8cd197be40715929
 COOKBOOK_URL=https://github.com/christianlupus-nextcloud/cookbook-releases/releases/download/v0.11.2/cookbook-0.11.2.tar.gz
 DROP_ACCOUNT_URL=https://packages.framasoft.org/projects/nextcloud-apps/drop-account/drop_account-2.6.0.tar.gz
 NEWS_URL=https://github.com/nextcloud/news/releases/download/25.0.0-alpha8/news.tar.gz

diff --git a/packages/nextcloud/packages/nextcloud_test_presets/docker/presets/spreed/20.0 b/packages/nextcloud/packages/nextcloud_test_presets/docker/presets/spreed/20.0
@@ -0,0 +1,8 @@
+SERVER_VERSION=30.0.0-fpm-alpine@sha256:df40181b01e78e771484c6f7f6d43bcd2914f5792df5f0488bbb2acc1d26cf8f
+COOKBOOK_URL=https://github.com/christianlupus-nextcloud/cookbook-releases/releases/download/v0.11.2/cookbook-0.11.2.tar.gz
+DROP_ACCOUNT_URL=https://packages.framasoft.org/projects/nextcloud-apps/drop-account/drop_account-2.6.0.tar.gz
+NEWS_URL=https://github.com/nextcloud/news/releases/download/25.0.0-alpha8/news.tar.gz
+NOTES_URL=https://github.com/nextcloud-releases/notes/releases/download/v4.11.0/notes-v4.11.0.tar.gz
+SPREED_URL=https://github.com/nextcloud-releases/spreed/releases/download/v20.0.0/spreed-v20.0.0.tar.gz
+TABLES_URL=https://github.com/nextcloud-releases/tables/releases/download/v0.8.0/tables-v0.8.0.tar.gz
+UPPUSH_URL=https://codeberg.org/NextPush/uppush/archive/1.5.1.tar.gz
diff --git a/packages/nextcloud/packages/nextcloud_test_presets/docker/presets/tables/0.6 b/packages/nextcloud/packages/nextcloud_test_presets/docker/presets/tables/0.6
@@ -1,4 +1,4 @@
-SERVER_VERSION=30.0.0-fpm-alpine@sha256:df40181b01e78e771484c6f7f6d43bcd2914f5792df5f0488bbb2acc1d26cf8f
+SERVER_VERSION=29.0.7-fpm-alpine@sha256:1ce452416b83d692e045b8a6eabf0171a15ea753d70e3fdf8cd197be40715929
 COOKBOOK_URL=https://github.com/christianlupus-nextcloud/cookbook-releases/releases/download/v0.11.2/cookbook-0.11.2.tar.gz
 DROP_ACCOUNT_URL=https://packages.framasoft.org/projects/nextcloud-apps/drop-account/drop_account-2.6.0.tar.gz
 NEWS_URL=https://github.com/nextcloud/news/releases/download/25.0.0-alpha8/news.tar.gz

diff --git a/packages/nextcloud/packages/nextcloud_test_presets/docker/presets/tables/0.7 b/packages/nextcloud/packages/nextcloud_test_presets/docker/presets/tables/0.7
@@ -3,6 +3,6 @@ COOKBOOK_URL=https://github.com/christianlupus-nextcloud/cookbook-releases/relea
 DROP_ACCOUNT_URL=https://packages.framasoft.org/projects/nextcloud-apps/drop-account/drop_account-2.6.0.tar.gz
 NEWS_URL=https://github.com/nextcloud/news/releases/download/25.0.0-alpha8/news.tar.gz
 NOTES_URL=https://github.com/nextcloud-releases/notes/releases/download/v4.11.0/notes-v4.11.0.tar.gz
-SPREED_URL=https://github.com/nextcloud-releases/spreed/releases/download/v19.0.9/spreed-v19.0.9.tar.gz
+SPREED_URL=https://github.com/nextcloud-releases/spreed/releases/download/v20.0.0/spreed-v20.0.0.tar.gz
 TABLES_URL=https://github.com/nextcloud-releases/tables/releases/download/v0.7.5/tables-v0.7.5.tar.gz
 UPPUSH_URL=https://codeberg.org/NextPush/uppush/archive/1.5.1.tar.gz
diff --git a/packages/nextcloud/packages/nextcloud_test_presets/docker/presets/tables/0.8 b/packages/nextcloud/packages/nextcloud_test_presets/docker/presets/tables/0.8
@@ -3,6 +3,6 @@ COOKBOOK_URL=https://github.com/christianlupus-nextcloud/cookbook-releases/relea
 DROP_ACCOUNT_URL=https://packages.framasoft.org/projects/nextcloud-apps/drop-account/drop_account-2.6.0.tar.gz
 NEWS_URL=https://github.com/nextcloud/news/releases/download/25.0.0-alpha8/news.tar.gz
 NOTES_URL=https://github.com/nextcloud-releases/notes/releases/download/v4.11.0/notes-v4.11.0.tar.gz
-SPREED_URL=https://github.com/nextcloud-releases/spreed/releases/download/v19.0.9/spreed-v19.0.9.tar.gz
+SPREED_URL=https://github.com/nextcloud-releases/spreed/releases/download/v20.0.0/spreed-v20.0.0.tar.gz
 TABLES_URL=https://github.com/nextcloud-releases/tables/releases/download/v0.8.0/tables-v0.8.0.tar.gz
 UPPUSH_URL=https://codeberg.org/NextPush/uppush/archive/1.5.1.tar.gz
diff --git a/packages/nextcloud/packages/nextcloud_test_presets/docker/presets/uppush/1.4 b/packages/nextcloud/packages/nextcloud_test_presets/docker/presets/uppush/1.4
@@ -1,4 +1,4 @@
-SERVER_VERSION=30.0.0-fpm-alpine@sha256:df40181b01e78e771484c6f7f6d43bcd2914f5792df5f0488bbb2acc1d26cf8f
+SERVER_VERSION=29.0.7-fpm-alpine@sha256:1ce452416b83d692e045b8a6eabf0171a15ea753d70e3fdf8cd197be40715929
 COOKBOOK_URL=https://github.com/christianlupus-nextcloud/cookbook-releases/releases/download/v0.11.2/cookbook-0.11.2.tar.gz
 DROP_ACCOUNT_URL=https://packages.framasoft.org/projects/nextcloud-apps/drop-account/drop_account-2.6.0.tar.gz
 NEWS_URL=https://github.com/nextcloud/news/releases/download/25.0.0-alpha8/news.tar.gz

diff --git a/packages/nextcloud/packages/nextcloud_test_presets/docker/presets/uppush/1.5 b/packages/nextcloud/packages/nextcloud_test_presets/docker/presets/uppush/1.5
@@ -3,6 +3,6 @@ COOKBOOK_URL=https://github.com/christianlupus-nextcloud/cookbook-releases/relea
 DROP_ACCOUNT_URL=https://packages.framasoft.org/projects/nextcloud-apps/drop-account/drop_account-2.6.0.tar.gz
 NEWS_URL=https://github.com/nextcloud/news/releases/download/25.0.0-alpha8/news.tar.gz
 NOTES_URL=https://github.com/nextcloud-releases/notes/releases/download/v4.11.0/notes-v4.11.0.tar.gz
-SPREED_URL=https://github.com/nextcloud-releases/spreed/releases/download/v19.0.9/spreed-v19.0.9.tar.gz
+SPREED_URL=https://github.com/nextcloud-releases/spreed/releases/download/v20.0.0/spreed-v20.0.0.tar.gz
 TABLES_URL=https://github.com/nextcloud-releases/tables/releases/download/v0.8.0/tables-v0.8.0.tar.gz
 UPPUSH_URL=https://codeberg.org/NextPush/uppush/archive/1.5.1.tar.gz
diff --git a/packages/nextcloud/packages/nextcloud_test_presets/lib/src/generate_presets.dart b/packages/nextcloud/packages/nextcloud_test_presets/lib/src/generate_presets.dart
@@ -112,7 +112,7 @@ Future<List<ServerRelease>> _getServerReleases(http.Client httpClient) async {
           continue;
         }
 
-        final version = Version.parse(name);
+        final version = Version.parse(name.substring(0, name.length - 11));
         final normalizedVersion = Version(version.major, version.minor, 0);
 
         if (version < core.minVersion) {

diff --git a/packages/nextcloud/packages/nextcloud_test_presets/lib/src/models/server_release.dart b/packages/nextcloud/packages/nextcloud_test_presets/lib/src/models/server_release.dart
@@ -12,7 +12,7 @@ class ServerRelease implements Comparable<ServerRelease> {
 
   final String dockerImageDigest;
 
-  String get dockerImageTag => '$version@$dockerImageDigest';
+  String get dockerImageTag => '$version-fpm-alpine@$dockerImageDigest';
 
   String get presetVersion => '${version.major}.${version.minor}';
 

diff --git a/tool/generate-nextcloud-test-presets.sh b/tool/generate-nextcloud-test-presets.sh
@@ -4,5 +4,6 @@ cd "$(dirname "$0")/.."
 
 (
   cd packages/nextcloud/packages/nextcloud_test_presets
+  rm -rf docker/presets/*
   fvm dart run nextcloud_test_presets:generate_presets
 )