Upgrade Dart analysis SDK. (dart-lang#8380)

isoos · Dec 10, 2024 · b3e7c01 · b3e7c01
1 parent 48db419
commit b3e7c01
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,9 @@ 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`
+ * Upgraded pana to `0.22.17`.
  * Note: `search` isolate renewal is randomized.
 
 ## `20241205t082000-all`

diff --git 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
@@ -24,10 +24,10 @@ final RegExp runtimeVersionPattern = RegExp(r'^\d{4}\.\d{2}\.\d{2}$');
 /// when the version switch happens.
 const _acceptedRuntimeVersions = <String>[
   // 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 =

diff --git 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
@@ -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/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);

diff --git 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: