Version 3.3.0-92.0.dev

Merge 47ae85b into dev
dart-lang · Nov 2, 2023 · a9a82f0 · a9a82f0
2 parents 3c45f68 + 47ae85b
commit a9a82f0
Show file tree

Hide file tree

Showing 173 changed files with 4,485 additions and 1,657 deletions.
diff --git a/.github/workflows/scorecards-analysis.yml b/.github/workflows/scorecards-analysis.yml
@@ -28,7 +28,7 @@ jobs:
           persist-credentials: false
 
       - name: "Run analysis"
-        uses: ossf/scorecard-action@483ef80eb98fb506c348f7d62e28055e49fe2398
+        uses: ossf/scorecard-action@0864cf19026789058feabb7e87baa5f140aac736
         with:
           results_file: results.sarif
           results_format: sarif

diff --git a/DEPS b/DEPS
@@ -514,6 +514,17 @@ Var("dart_root") + "/third_party/pkg/tar":
   Var("dart_root") + "/third_party/pkg/yaml":
       Var("dart_git") + "yaml.git" + "@" + Var("yaml_rev"),
 
+  Var("dart_root") + "/buildtools/sysroot/linux": {
+      "packages": [
+          {
+              "package": "fuchsia/third_party/sysroot/linux",
+              "version": "git_revision:fa7a5a9710540f30ff98ae48b62f2cdf72ed2acd",
+          },
+      ],
+      "condition": "host_os == linux",
+      "dep_type": "cipd",
+  },
+
   # Keep consistent with pkg/test_runner/lib/src/options.dart.
   Var("dart_root") + "/buildtools/linux-x64/clang": {
       "packages": [
@@ -767,34 +778,6 @@ hooks = [
     'pattern': '.',
     'action': ['python3', 'sdk/tools/generate_sdk_version_file.py'],
   },
-  {
-    'name': 'sysroot_arm',
-    'pattern': '.',
-    'condition': 'checkout_linux',
-    'action': ['python3', 'sdk/build/linux/sysroot_scripts/install-sysroot.py',
-               '--arch=arm'],
-  },
-  {
-    'name': 'sysroot_arm64',
-    'pattern': '.',
-    'condition': 'checkout_linux',
-    'action': ['python3', 'sdk/build/linux/sysroot_scripts/install-sysroot.py',
-               '--arch=arm64'],
-  },
-  {
-    'name': 'sysroot_x86',
-    'pattern': '.',
-    'condition': 'checkout_linux',
-    'action': ['python3', 'sdk/build/linux/sysroot_scripts/install-sysroot.py',
-               '--arch=x86'],
-  },
-  {
-    'name': 'sysroot_x64',
-    'pattern': '.',
-    'condition': 'checkout_linux',
-    'action': ['python3', 'sdk/build/linux/sysroot_scripts/install-sysroot.py',
-               '--arch=x64'],
-  },
   {
     'name': 'buildtools',
     'pattern': '.',

diff --git a/build/config/sysroot.gni b/build/config/sysroot.gni
@@ -37,22 +37,7 @@ if (is_linux) {
       assert(false)
     }
   } else if (dart_sysroot == "debian") {
-    if (current_cpu == "x86") {
-      target_sysroot = rebase_path("//build/linux/debian_stretch_i386-sysroot",
-                                   root_build_dir)
-    } else if (current_cpu == "x64") {
-      target_sysroot = rebase_path("//build/linux/debian_stretch_amd64-sysroot",
-                                   root_build_dir)
-    } else if (current_cpu == "arm") {
-      target_sysroot = rebase_path("//build/linux/debian_stretch_arm-sysroot",
-                                   root_build_dir)
-    } else if (current_cpu == "arm64") {
-      target_sysroot = rebase_path("//build/linux/debian_stretch_arm64-sysroot",
-                                   root_build_dir)
-    } else {
-      print("There is no $dart_sysroot sysroot present for $current_cpu")
-      assert(false)
-    }
+    target_sysroot = rebase_path("//buildtools/sysroot/linux", root_build_dir)
   } else if (dart_sysroot != "") {
     print("There is no $dart_sysroot sysroot support")
     assert(false)

diff --git a/build/linux/sysroot_scripts/README.dart.md b/build/linux/sysroot_scripts/README.dart.md
diff --git a/build/linux/sysroot_scripts/install-sysroot.py b/build/linux/sysroot_scripts/install-sysroot.py
diff --git a/build/linux/sysroot_scripts/sysroots.json b/build/linux/sysroot_scripts/sysroots.json
diff --git a/pkg/_fe_analyzer_shared/lib/src/experiments/flags.dart b/pkg/_fe_analyzer_shared/lib/src/experiments/flags.dart
@@ -92,7 +92,7 @@ enum ExperimentalFlag {
       isEnabledByDefault: false,
       isExpired: false,
       experimentEnabledVersion: defaultLanguageVersion,
-      experimentReleasedVersion: defaultLanguageVersion),
+      experimentReleasedVersion: const Version(3, 3)),
 
   namedArgumentsAnywhere(
       name: 'named-arguments-anywhere',