From 1808d1c4d1f2c7e0ccef990dcb0bad051535d9fb Mon Sep 17 00:00:00 2001 From: Istvan Soos Date: Mon, 9 Dec 2024 18:03:23 +0100 Subject: [PATCH 1/3] Upgrade Dart analysis SDK. --- CHANGELOG.md | 2 ++ Dockerfile.worker | 2 +- app/lib/shared/versions.dart | 6 +++--- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 188a0459f9..02798b4390 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ Important changes to data models, configuration, and migrations between each AppEngine version, listed here to ease deployment and troubleshooting. ## Next Release (replace with git tag when deployed) + * Bump runtimeVersion to `2024.12.09`. + * Upgraded stable Dart analysis SDK to `3.6.0` * Note: `search` isolate renewal is randomized. ## `20241205t082000-all` diff --git a/Dockerfile.worker b/Dockerfile.worker index 41572102a9..1de0c97e83 100644 --- a/Dockerfile.worker +++ b/Dockerfile.worker @@ -23,7 +23,7 @@ RUN mkdir -p /home/worker/config/dart-stable RUN mkdir -p /home/worker/config/flutter-stable # Setup Dart SDK into /home/worker/dart/{stable,preview}/ -RUN XDG_CONFIG_HOME=/home/worker/config/dart-stable tool/setup-dart.sh /home/worker/dart/stable 3.6.0-334.4.beta beta +RUN XDG_CONFIG_HOME=/home/worker/config/dart-stable tool/setup-dart.sh /home/worker/dart/stable stable/raw/hash/ae7ca5199a0559db0ae60533e9cedd3ce0d6ab04 # Setup Flutter SDK into /home/worker/flutter/{stable,preview}/ RUN XDG_CONFIG_HOME=/home/worker/config/flutter-stable tool/setup-flutter.sh /home/worker/flutter/stable 3.27.0-0.2.pre beta diff --git a/app/lib/shared/versions.dart b/app/lib/shared/versions.dart index c589991d9a..f3d685f84d 100644 --- a/app/lib/shared/versions.dart +++ b/app/lib/shared/versions.dart @@ -24,10 +24,10 @@ final RegExp runtimeVersionPattern = RegExp(r'^\d{4}\.\d{2}\.\d{2}$'); /// when the version switch happens. const _acceptedRuntimeVersions = [ // The current [runtimeVersion]. - '2024.12.04', + '2024.12.09', // Fallback runtime versions. + '2024.12.04', '2024.11.21', - '2024.11.18', ]; /// Sets the current runtime versions. @@ -62,7 +62,7 @@ bool shouldGCVersion(String version) => // keep in-sync with SDK version in .mono_repo.yml and Dockerfile final String runtimeSdkVersion = '3.5.0'; -final String toolStableDartSdkVersion = '3.6.0-334.4.beta'; +final String toolStableDartSdkVersion = '3.6.0'; final String toolStableFlutterSdkVersion = '3.27.0-0.2.pre'; final semanticToolStableDartSdkVersion = From 2bfb0197d521d604045c43209e7d13804a03a21c Mon Sep 17 00:00:00 2001 From: Istvan Soos Date: Tue, 10 Dec 2024 09:57:06 +0100 Subject: [PATCH 2/3] Upgrade pana --- CHANGELOG.md | 1 + app/pubspec.yaml | 2 +- pkg/pub_worker/pubspec.yaml | 2 +- pubspec.lock | 4 ++-- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 02798b4390..2a1db1161f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ AppEngine version, listed here to ease deployment and troubleshooting. ## Next Release (replace with git tag when deployed) * Bump runtimeVersion to `2024.12.09`. * Upgraded stable Dart analysis SDK to `3.6.0` + * Upgraded pana to `0.22.17`. * Note: `search` isolate renewal is randomized. ## `20241205t082000-all` diff --git a/app/pubspec.yaml b/app/pubspec.yaml index a569808d7f..6903e28682 100644 --- a/app/pubspec.yaml +++ b/app/pubspec.yaml @@ -47,7 +47,7 @@ dependencies: watcher: ^1.0.0 yaml: ^3.1.0 # pana version to be pinned - pana: '0.22.16' + pana: '0.22.17' # 3rd-party packages with pinned versions mailer: '6.2.0' ulid: '2.0.1' diff --git a/pkg/pub_worker/pubspec.yaml b/pkg/pub_worker/pubspec.yaml index bf7f499824..569e4aaced 100644 --- a/pkg/pub_worker/pubspec.yaml +++ b/pkg/pub_worker/pubspec.yaml @@ -10,7 +10,7 @@ dependencies: appengine: ^0.13.6 json_annotation: ^4.3.0 jsontool: ^2.0.0 - pana: ^0.22.16 + pana: ^0.22.17 path: ^1.8.0 lints: ^5.0.0 # required for pana meta: ^1.7.0 diff --git a/pubspec.lock b/pubspec.lock index c8ae9f261c..2c2874f906 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -626,10 +626,10 @@ packages: dependency: transitive description: name: pana - sha256: c3f928a6517ad4eb631e839c41b61ca2895263f823c66f1a5c411596146556f1 + sha256: be1fdf41fb7b1085069d596ef55c0172cce336692e4b4ee97957c999694d777d url: "https://pub.dev" source: hosted - version: "0.22.16" + version: "0.22.17" path: dependency: transitive description: From 553f9da06515eb9e419096b5f0515994a2205b8d Mon Sep 17 00:00:00 2001 From: Istvan Soos Date: Tue, 10 Dec 2024 10:24:54 +0100 Subject: [PATCH 3/3] additional log for end2end test --- pkg/pub_worker/test/dockerized_end2end_test.dart | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkg/pub_worker/test/dockerized_end2end_test.dart b/pkg/pub_worker/test/dockerized_end2end_test.dart index 5f84f1fb73..882e01aeee 100644 --- a/pkg/pub_worker/test/dockerized_end2end_test.dart +++ b/pkg/pub_worker/test/dockerized_end2end_test.dart @@ -75,9 +75,14 @@ void main() { final version = versions[i]; final result = await server.waitForResult(package, version); + final logTxtBytes = result.lookup('log.txt'); + final logTxt = logTxtBytes == null + ? '[no log.txt]' + : utf8.decode(gzip.decode(logTxtBytes)); + final docIndex = result.index.lookup('doc/index.html'); expect(docIndex, isNotNull, - reason: '$package must have documentation'); + reason: '$package must have documentation, see log:\n$logTxt'); final panaSummaryBytes = result.lookup('summary.json'); expect(panaSummaryBytes, isNotNull);