Skip to content

Commit a0949f5

Browse files
mosuemmosuem
authored
Workflow cleanups (#846)
* Add pubspec overrides * Remove tool to change deps * Fix override * Add health workflow * Do not test breaking changes * Remove health workflow * Switch to dart script * Fix path * Add newlines * Fixes
1 parent 4282d81 commit a0949f5

File tree

22 files changed

+78
-84
lines changed

22 files changed

+78
-84
lines changed

‎.github/workflows/native.yaml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -63,11 +63,8 @@ jobs:
6363
ndk-version: r26b
6464
if: ${{ matrix.sdk == 'stable' }}
6565

66-
- run: dart pub get -C ../../tools/
67-
if: ${{ matrix.dependencies == 'path' }}
68-
69-
- run: dart ../../tools/bin/change_dependencies.dart
70-
if: ${{ matrix.dependencies == 'path' }}
66+
- run: dart run ../../tools/delete_pubspec_overrides.dart
67+
if: ${{ matrix.dependencies == 'published' }}
7168

7269
- run: dart pub get
7370

‎pkgs/native_assets_builder/pubspec_overrides.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
dependency_overrides:
2+
native_assets_cli:
3+
path: ../native_assets_cli/

‎pkgs/native_assets_builder/test/data/cyclic_package_1/pubspec_overrides.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
dependency_overrides:
2+
native_assets_cli:
3+
path: ../../../../native_assets_cli/

‎pkgs/native_assets_builder/test/data/cyclic_package_2/pubspec_overrides.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
dependency_overrides:
2+
native_assets_cli:
3+
path: ../../../../native_assets_cli/

‎pkgs/native_assets_builder/test/data/manifest.yaml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,10 @@
22
# a completely clean setup.
33
- cyclic_package_1/build.dart
44
- cyclic_package_1/pubspec.yaml
5+
- cyclic_package_1/pubspec_overrides.yaml
56
- cyclic_package_2/build.dart
67
- cyclic_package_2/pubspec.yaml
8+
- cyclic_package_2/pubspec_overrides.yaml
79
- dart_app/bin/dart_app.dart
810
- dart_app/pubspec.yaml
911
- native_add/build.dart
@@ -12,6 +14,7 @@
1214
- native_add/lib/src/native_add_bindings_generated.dart
1315
- native_add/lib/src/native_add.dart
1416
- native_add/pubspec.yaml
17+
- native_add/pubspec_overrides.yaml
1518
- native_add/src/native_add.c
1619
- native_add/src/native_add.h
1720
- native_add/test/native_add_test.dart
@@ -21,19 +24,26 @@
2124
- native_subtract/lib/src/native_subtract_bindings_generated.dart
2225
- native_subtract/lib/src/native_subtract.dart
2326
- native_subtract/pubspec.yaml
27+
- native_subtract/pubspec_overrides.yaml
2428
- native_subtract/src/native_subtract.c
2529
- native_subtract/src/native_subtract.h
2630
- package_reading_metadata/build.dart
2731
- package_reading_metadata/pubspec.yaml
32+
- package_reading_metadata/pubspec_overrides.yaml
2833
- package_with_metadata/build.dart
2934
- package_with_metadata/pubspec.yaml
35+
- package_with_metadata/pubspec_overrides.yaml
3036
- some_dev_dep/bin/some_dev_dep.dart
3137
- some_dev_dep/pubspec.yaml
3238
- wrong_build_output/build.dart
3339
- wrong_build_output/pubspec.yaml
40+
- wrong_build_output/pubspec_overrides.yaml
3441
- wrong_build_output_2/build.dart
3542
- wrong_build_output_2/pubspec.yaml
43+
- wrong_build_output_2/pubspec_overrides.yaml
3644
- wrong_build_output_3/build.dart
3745
- wrong_build_output_3/pubspec.yaml
46+
- wrong_build_output_3/pubspec_overrides.yaml
3847
- wrong_namespace_asset/build.dart
3948
- wrong_namespace_asset/pubspec.yaml
49+
- wrong_namespace_asset/pubspec_overrides.yaml

‎pkgs/native_assets_builder/test/data/native_add/manifest.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
- lib/src/native_add_bindings_generated.dart
55
- lib/src/native_add.dart
66
- pubspec.yaml
7+
- pubspec_overrides.yaml
78
- src/native_add.c
89
- src/native_add.h
910
- test/native_add_test.dart

‎pkgs/native_assets_builder/test/data/native_add/pubspec_overrides.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
dependency_overrides:
2+
native_assets_cli:
3+
path: ../../../../native_assets_cli/
4+
native_toolchain_c:
5+
path: ../../../../native_toolchain_c/

‎pkgs/native_assets_builder/test/data/native_add_add_source/pubspec_overrides.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
dependency_overrides:
2+
native_assets_cli:
3+
path: ../../../../native_assets_cli/
4+
native_toolchain_c:
5+
path: ../../../../native_toolchain_c/

‎pkgs/native_assets_builder/test/data/native_subtract/pubspec_overrides.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
dependency_overrides:
2+
native_assets_cli:
3+
path: ../../../../native_assets_cli/
4+
native_toolchain_c:
5+
path: ../../../../native_toolchain_c/

‎pkgs/native_assets_builder/test/data/package_reading_metadata/pubspec_overrides.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
dependency_overrides:
2+
native_assets_cli:
3+
path: ../../../../native_assets_cli/

‎pkgs/native_assets_builder/test/data/package_with_metadata/pubspec_overrides.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
dependency_overrides:
2+
native_assets_cli:
3+
path: ../../../../native_assets_cli/

‎pkgs/native_assets_builder/test/data/wrong_build_output/pubspec_overrides.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
dependency_overrides:
2+
native_assets_cli:
3+
path: ../../../../native_assets_cli/

‎pkgs/native_assets_builder/test/data/wrong_build_output_2/pubspec_overrides.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
dependency_overrides:
2+
native_assets_cli:
3+
path: ../../../../native_assets_cli/

‎pkgs/native_assets_builder/test/data/wrong_build_output_3/pubspec_overrides.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
dependency_overrides:
2+
native_assets_cli:
3+
path: ../../../../native_assets_cli/

‎pkgs/native_assets_builder/test/data/wrong_namespace_asset/pubspec_overrides.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
dependency_overrides:
2+
native_assets_cli:
3+
path: ../../../../native_assets_cli/

‎pkgs/native_assets_builder/test/helpers.dart

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -123,10 +123,15 @@ Future<void> copyTestProjects({
123123
for (final path in manifestYaml.contents as YamlList)
124124
Uri(path: path as String)
125125
];
126-
final filesToCopy =
127-
manifest.where((e) => e.pathSegments.last != 'pubspec.yaml').toList();
128-
final filesToModify =
129-
manifest.where((e) => e.pathSegments.last == 'pubspec.yaml').toList();
126+
final filesToCopy = manifest
127+
.where((e) => !(e.pathSegments.last.startsWith('pubspec') &&
128+
e.pathSegments.last.endsWith('.yaml')))
129+
.toList();
130+
final filesToModify = manifest
131+
.where((e) =>
132+
e.pathSegments.last.startsWith('pubspec') &&
133+
e.pathSegments.last.endsWith('.yaml'))
134+
.toList();
130135

131136
for (final pathToCopy in filesToCopy) {
132137
final sourceFile = File.fromUri(sourceUri.resolveUri(pathToCopy));

‎pkgs/native_assets_cli/example/native_add_library/pubspec_overrides.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
dependency_overrides:
2+
native_assets_cli:
3+
path: ../../../native_assets_cli/
4+
native_toolchain_c:
5+
path: ../../../native_toolchain_c/

‎pkgs/native_toolchain_c/pubspec_overrides.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
dependency_overrides:
2+
native_assets_cli:
3+
path: ../native_assets_cli/

‎tools/.gitignore

Lines changed: 0 additions & 9 deletions
This file was deleted.

‎tools/bin/change_dependencies.dart

Lines changed: 0 additions & 52 deletions
This file was deleted.

‎tools/delete_pubspec_overrides.dart

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
import 'dart:io';
2+
3+
void main(List<String> arguments) => Directory.current
4+
.list(recursive: true)
5+
.where((f) => f.path.endsWith('pubspec_overrides.yaml'))
6+
.forEach((f) => f.deleteSync());

‎tools/pubspec.yaml

Lines changed: 0 additions & 14 deletions
This file was deleted.

0 commit comments

Comments
 (0)