[infra] Create a pub workspace

Author: dcharkes

.github/workflows/native.yaml

@@ -57,104 +57,12 @@ jobs:
 
       - run: dart pub get
 
-      - run: dart pub get -C test_data/dart_app/
-        if: ${{ matrix.package == 'native_assets_builder' }}
-
-      - run: dart pub get -C test_data/native_add/
-        if: ${{ matrix.package == 'native_assets_builder' }}
-
-      - run: dart pub get -C test_data/native_add_duplicate/
-        if: ${{ matrix.package == 'native_assets_builder' }}
-
-      - run: dart pub get -C test_data/native_add_add_source/
-        if: ${{ matrix.package == 'native_assets_builder' }}
-
       - run: dart pub get -C test_data/native_add_version_skew/
         if: ${{ matrix.package == 'native_assets_builder' }}
 
       - run: dart pub get -C test_data/native_add_version_skew_2/
         if: ${{ matrix.package == 'native_assets_builder' }}
 
-      - run: dart pub get -C test_data/native_subtract/
-        if: ${{ matrix.package == 'native_assets_builder' }}
-
-      - run: dart pub get -C test_data/package_reading_metadata/
-        if: ${{ matrix.package == 'native_assets_builder' }}
-
-      - run: dart pub get -C test_data/package_with_metadata/
-        if: ${{ matrix.package == 'native_assets_builder' }}
-
-      - run: dart pub get -C test_data/simple_link/
-        if: ${{ matrix.package == 'native_assets_builder' }}
-
-      - run: dart pub get -C test_data/complex_link/
-        if: ${{ matrix.package == 'native_assets_builder' }}
-
-      - run: dart pub get -C test_data/complex_link_helper/
-        if: ${{ matrix.package == 'native_assets_builder' }}
-
-      - run: dart pub get -C test_data/drop_dylib_link/
-        if: ${{ matrix.package == 'native_assets_builder' }}
-
-      - run: dart pub get -C test_data/add_asset_link/
-        if: ${{ matrix.package == 'native_assets_builder' }}
-
-      - run: dart pub get -C test_data/transformer/
-        if: ${{ matrix.package == 'native_assets_builder' }}
-
-      - run: dart pub get -C test_data/treeshaking_native_libs/
-        if: ${{ matrix.package == 'native_assets_builder' }}
-
-      - run: dart pub get -C test_data/native_dynamic_linking/
-        if: ${{ matrix.package == 'native_assets_builder' }}
-
-      - run: dart pub get -C test_data/reusable_dynamic_library/
-        if: ${{ matrix.package == 'native_assets_builder' }}
-
-      - run: dart pub get -C test_data/reuse_dynamic_library/
-        if: ${{ matrix.package == 'native_assets_builder' }}
-
-      - run: dart pub get -C test_data/user_defines/
-        if: ${{ matrix.package == 'native_assets_builder' }}
-
-      - run: dart pub get -C test_data/no_hook/
-        if: ${{ matrix.package == 'native_assets_builder' }}
-
-      - run: dart pub get -C example/build/download_asset/
-        if: ${{ matrix.package == 'native_assets_cli' }}
-
-      - run: dart pub get -C example/build/native_dynamic_linking/
-        if: ${{ matrix.package == 'native_assets_cli' }}
-
-      - run: dart pub get -C example/build/native_add_app/
-        if: ${{ matrix.package == 'native_assets_cli' }}
-
-      - run: dart pub get -C example/build/native_add_library/
-        if: ${{ matrix.package == 'native_assets_cli' }}
-
-      - run: dart pub get -C example/build/use_dart_api/
-        if: ${{ matrix.package == 'native_assets_cli' }}
-
-      - run: dart pub get -C example/build/system_library/
-        if: ${{ matrix.package == 'native_assets_cli' }}
-  
-      - run: dart pub get -C example/link/package_with_assets/
-        if: ${{ matrix.package == 'native_assets_cli' }}
-
-      - run: dart pub get -C example/link/app_with_asset_treeshaking/
-        if: ${{ matrix.package == 'native_assets_cli' }}
-      - run: dart pub get -C test_data/fail_build/
-        if: ${{ matrix.package == 'native_assets_builder' }}
-
-      - run: dart pub get -C test_data/depend_on_fail_build/
-        if: ${{ matrix.package == 'native_assets_builder' }}
-
-      - run: dart pub get -C test_data/depend_on_fail_build_app/
-        if: ${{ matrix.package == 'native_assets_builder' }}
-
-      - run: dart pub get -C test_data/system_library/
-        if: ${{ matrix.package == 'native_assets_builder' }}
-
       - run: dart analyze --fatal-infos
         # Run on dev to ensure we're not depending on deprecated SDK things.
 
@@ -166,16 +74,18 @@ jobs:
 
       - run: dart test
 
-      - run: dart --enable-experiment=native-assets test
-        working-directory: pkgs/${{ matrix.package }}/example/build/native_dynamic_linking/
-        # TODO(https://github.com/dart-lang/native/issues/190): Enable on windows once
-        # https://github.com/dart-lang/sdk/commit/903eea6bfb8ee405587f0866a1d1e92eea45d29e
-        # has landed in dev channel.
-        if: ${{ matrix.package == 'native_assets_cli' && matrix.sdk == 'dev' && !matrix.breaking-change && matrix.os != 'windows' }}
+      # TODO(https://github.com/dart-lang/sdk/issues/60489): Fix `dart test` with workspaces
+      # - run: dart --enable-experiment=native-assets test
+      #   working-directory: pkgs/${{ matrix.package }}/example/build/native_dynamic_linking/
+      #   # TODO(https://github.com/dart-lang/native/issues/190): Enable on windows once
+      #   # https://github.com/dart-lang/sdk/commit/903eea6bfb8ee405587f0866a1d1e92eea45d29e
+      #   # has landed in dev channel.
+      #   if: ${{ matrix.package == 'native_assets_cli' && matrix.sdk == 'dev' && !matrix.breaking-change && matrix.os != 'windows' }}
 
-      - run: dart --enable-experiment=native-assets test
-        working-directory: pkgs/${{ matrix.package }}/example/build/native_add_app/
-        if: ${{ matrix.package == 'native_assets_cli' && matrix.sdk == 'dev' && !matrix.breaking-change }}
+      # TODO(https://github.com/dart-lang/sdk/issues/60489): Fix `dart test` with workspaces
+      # - run: dart --enable-experiment=native-assets test
+      #   working-directory: pkgs/${{ matrix.package }}/example/build/native_add_app/
+      #   if: ${{ matrix.package == 'native_assets_cli' && matrix.sdk == 'dev' && !matrix.breaking-change }}
 
       - run: dart --enable-experiment=native-assets run
         working-directory: pkgs/${{ matrix.package }}/example/build/native_add_app/
@@ -189,17 +99,20 @@ jobs:
         working-directory: pkgs/${{ matrix.package }}/example/build/native_add_app/bin/native_add_app/
         if: ${{ matrix.package == 'native_assets_cli' && matrix.sdk == 'dev' && !matrix.breaking-change }}
 
-      - run: dart --enable-experiment=native-assets test
-        working-directory: pkgs/${{ matrix.package }}/example/build/use_dart_api/
-        if: ${{ matrix.package == 'native_assets_cli' && matrix.sdk == 'dev' && !matrix.breaking-change }}
+      # TODO(https://github.com/dart-lang/sdk/issues/60489): Fix `dart test` with workspaces
+      # - run: dart --enable-experiment=native-assets test
+      #   working-directory: pkgs/${{ matrix.package }}/example/build/use_dart_api/
+      #   if: ${{ matrix.package == 'native_assets_cli' && matrix.sdk == 'dev' && !matrix.breaking-change }}
 
-      - run: dart --enable-experiment=native-assets test
-        working-directory: pkgs/${{ matrix.package }}/example/build/download_asset/
-        if: ${{ matrix.package == 'native_assets_cli' && matrix.sdk == 'dev' && !matrix.breaking-change }}
-
-      - run: dart --enable-experiment=native-assets test
-        working-directory: pkgs/${{ matrix.package }}/example/build/system_library/
-        if: ${{ matrix.package == 'native_assets_cli' && matrix.sdk == 'dev' && !matrix.breaking-change }}
+      # TODO(https://github.com/dart-lang/sdk/issues/60489): Fix `dart test` with workspaces
+      # - run: dart --enable-experiment=native-assets test
+      #   working-directory: pkgs/${{ matrix.package }}/example/build/download_asset/
+      #   if: ${{ matrix.package == 'native_assets_cli' && matrix.sdk == 'dev' && !matrix.breaking-change }}
+
+      # TODO(https://github.com/dart-lang/sdk/issues/60489): Fix `dart test` with workspaces
+      # - run: dart --enable-experiment=native-assets test
+      #   working-directory: pkgs/${{ matrix.package }}/example/build/system_library/
+      #   if: ${{ matrix.package == 'native_assets_cli' && matrix.sdk == 'dev' && !matrix.breaking-change }}
 
       - name: Install coverage
         run: dart pub global activate coverage

pkgs/code_assets/pubspec.yaml

@@ -8,6 +8,8 @@ description: >-
 
 publish_to: none
 
+resolution: workspace
+
 environment:
   sdk: '>=3.7.0 <4.0.0'
 

pkgs/data_assets/pubspec.yaml

@@ -8,6 +8,8 @@ description: >-
 
 publish_to: none
 
+resolution: workspace
+
 environment:
   sdk: '>=3.7.0 <4.0.0'
 

pkgs/hooks/pubspec.yaml

@@ -4,6 +4,8 @@ repository: https://github.com/dart-lang/native/tree/main/pkgs/hooks
 
 publish_to: none
 
+resolution: workspace
+
 environment:
   sdk: '>=3.7.0 <4.0.0'
 

pkgs/json_syntax_generator/pubspec.yaml

@@ -9,6 +9,8 @@ description: |
 
 publish_to: none
 
+resolution: workspace
+
 environment:
   sdk: '>=3.7.0 <4.0.0'
 

pkgs/native_assets_builder/pubspec.yaml

@@ -6,6 +6,8 @@ repository: https://github.com/dart-lang/native/tree/main/pkgs/native_assets_bui
 
 publish_to: none
 
+resolution: workspace
+
 environment:
   sdk: '>=3.7.0 <4.0.0'
 

pkgs/native_assets_builder/test/build_runner/pub_workspace_test.dart

@@ -15,7 +15,7 @@ void main() async {
   late Uri tempUri;
   setUp(() async {
     tempUri = await tempDirForTest();
-    await copyTestProjects(targetUri: tempUri);
+    await copyTestProjects(targetUri: tempUri, addDependencyOverrides: false);
   });
 
   Future<void> makePubWorkspace(List<String> packages) async {
@@ -44,6 +44,7 @@ workspace:
   - $package/
 ''';
     }
+    printOnFailure(workspacePubSpec);
     await File.fromUri(workspacePubSpecUri).writeAsString(workspacePubSpec);
 
     await runPubGet(workingDirectory: tempUri, logger: logger);

pkgs/native_assets_builder/test/helpers.dart

@@ -232,7 +232,11 @@ extension AssetIterable on Iterable<EncodedAsset> {
   }
 }
 
-Future<void> copyTestProjects({Uri? sourceUri, required Uri targetUri}) async {
+Future<void> copyTestProjects({
+  Uri? sourceUri,
+  required Uri targetUri,
+  bool addDependencyOverrides = true,
+}) async {
   sourceUri ??= testDataUri;
   final manifestUri = sourceUri.resolve('manifest.yaml');
   final manifestFile = File.fromUri(manifestUri);
@@ -275,13 +279,25 @@ Future<void> copyTestProjects({Uri? sourceUri, required Uri targetUri}) async {
     await targetFile.writeAsBytes(await sourceFile.readAsBytes());
   }
   for (final pathToModify in filesToModify) {
+    const packagesToOverride = ['native_assets_cli', 'native_toolchain_c'];
     final sourceFile = File.fromUri(sourceUri.resolveUri(pathToModify));
     final targetFileUri = targetUri.resolveUri(pathToModify);
-    final sourceString = await sourceFile.readAsString();
-    final modifiedString = sourceString.replaceAll(
-      'path: ../../',
-      'path: ${pkgNativeAssetsBuilderUri.toFilePath().unescape()}',
-    );
+    var sourceString = await sourceFile.readAsString();
+    if (addDependencyOverrides &&
+        !pathToModify.path.contains('native_add_version_skew')) {
+      sourceString += '\ndependency_overrides:\n';
+      for (final package in packagesToOverride) {
+        sourceString += '  $package:\n';
+        sourceString += '    path: ../../../$package\n';
+      }
+    }
+
+    final modifiedString = sourceString
+        .replaceAll(
+          'path: ../../',
+          'path: ${pkgNativeAssetsBuilderUri.toFilePath().unescape()}',
+        )
+        .replaceAll('resolution: workspace', '');
     await File.fromUri(
       targetFileUri,
     ).writeAsString(modifiedString, flush: true);

pkgs/native_assets_builder/test_data/add_asset_link/pubspec.yaml

@@ -4,6 +4,8 @@ version: 0.1.0
 
 publish_to: none
 
+resolution: workspace
+
 environment:
   sdk: '>=3.7.0 <4.0.0'
 

pkgs/native_assets_builder/test_data/complex_link/pubspec.yaml

@@ -4,6 +4,8 @@ version: 0.1.0
 
 publish_to: none
 
+resolution: workspace
+
 environment:
   sdk: '>=3.7.0 <4.0.0'