Upgrade Dart analysis SDKs. (dart-lang#7477)

isoos · Feb 13, 2024 · 0596d5f · 0596d5f
1 parent 0a0169e
commit 0596d5f
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 13 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)
+ * Bumped runtimeVersion to `2024.02.13`.
+ * Upgraded stable Dart analysis SDK to `3.3.0` (hash: `74ea934a1e9b9f01e7fd06b1d872c9cf822c1d71`).
+ * Upgraded preview Dart analysis SDK to `3.4.0-131.0.dev`.
 
 ## `20240209t135900-all`
  * Bumped runtimeVersion to `2024.02.09`.

diff --git a/Dockerfile.worker b/Dockerfile.worker
@@ -22,8 +22,8 @@ WORKDIR /home/worker/pub-dev
 RUN mkdir -p /home/worker/config/preview
 
 # Setup Dart SDK into /home/worker/dart/{stable,preview}/
-RUN tool/setup-dart.sh /home/worker/dart/stable 3.2.6
-RUN XDG_CONFIG_HOME=/home/worker/config/preview tool/setup-dart.sh /home/worker/dart/preview 3.3.0-279.3.beta
+RUN tool/setup-dart.sh /home/worker/dart/stable stable/raw/hash/74ea934a1e9b9f01e7fd06b1d872c9cf822c1d71
+RUN XDG_CONFIG_HOME=/home/worker/config/preview tool/setup-dart.sh /home/worker/dart/preview 3.4.0-131.0.dev
 
 # Setup Flutter SDK into /home/worker/flutter/{stable,preview}/
 RUN tool/setup-flutter.sh /home/worker/flutter/stable 3.16.9

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.02.09',
+  '2024.02.13',
   // Fallback runtime versions.
+  '2024.02.09',
   '2024.02.05',
-  '2024.01.30',
 ];
 
 /// Sets the current runtime versions.
@@ -62,9 +62,9 @@ bool shouldGCVersion(String version) =>
 
 // keep in-sync with SDK version in .mono_repo.yml and Dockerfile
 final String runtimeSdkVersion = '3.2.0';
-final String toolStableDartSdkVersion = '3.2.6';
+final String toolStableDartSdkVersion = '3.3.0';
 final String toolStableFlutterSdkVersion = '3.16.9';
-final String toolPreviewDartSdkVersion = '3.3.0-279.3.beta';
+final String toolPreviewDartSdkVersion = '3.4.0-131.0.dev';
 final String toolPreviewFlutterSdkVersion = '3.19.0-0.4.pre';
 
 final semanticToolStableDartSdkVersion =

diff --git a/app/test/search/backend_test.dart b/app/test/search/backend_test.dart
@@ -5,14 +5,15 @@
 import 'package:clock/clock.dart';
 import 'package:pub_dev/search/backend.dart';
 import 'package:pub_dev/search/sdk_mem_index.dart';
+import 'package:pub_dev/shared/versions.dart';
 import 'package:test/test.dart';
 
 import '../shared/test_services.dart';
 
 void main() {
   group('search backend', () {
     testWithProfile('fetch SDK library description', fn: () async {
-      final index = SdkMemIndex.dart();
+      final index = SdkMemIndex.dart(version: runtimeSdkVersion);
       final descr = await searchBackend.fetchSdkLibraryDescriptions(
         baseUri: index.baseUri,
         libraryRelativeUrls: {

diff --git a/app/test/search/dartdoc_index_parsing_test.dart b/app/test/search/dartdoc_index_parsing_test.dart
@@ -39,9 +39,8 @@ void main() {
     }
 
     test('parse Dart SDK index.json', () async {
-      final file = await getCachedFile(
-          'dart-sdk-$toolStableDartSdkVersion.json',
-          'https://api.dart.dev/stable/$toolStableDartSdkVersion/index.json');
+      final file = await getCachedFile('dart-sdk-$runtimeSdkVersion.json',
+          'https://api.dart.dev/stable/$runtimeSdkVersion/index.json');
       final textContent = await file.readAsString();
       final index = DartdocIndex.parseJsonText(await file.readAsString());
       expect(index.entries, hasLength(greaterThan(10000)));

diff --git a/app/test/shared/versions_test.dart b/app/test/shared/versions_test.dart
@@ -83,9 +83,11 @@ void main() {
   test('Dart SDK versions should match Dockerfile.worker', () async {
     final dockerfileContent = await File('../Dockerfile.worker').readAsString();
     expect(
-        dockerfileContent,
-        contains(
-            'RUN tool/setup-dart.sh /home/worker/dart/stable $toolStableDartSdkVersion'));
+        dockerfileContent.contains(
+                'RUN tool/setup-dart.sh /home/worker/dart/stable stable/raw/hash/') ||
+            dockerfileContent.contains(
+                'RUN tool/setup-dart.sh /home/worker/dart/stable $toolStableDartSdkVersion'),
+        isTrue);
     expect(
         dockerfileContent,
         contains(