Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Workflow cleanups #846

Merged
merged 10 commits into from
Dec 5, 2023
Merged

Workflow cleanups #846

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
5284a3f
Add pubspec overrides
mosuem Dec 4, 2023
0af5c56
Remove tool to change deps
mosuem Dec 4, 2023
518d930
Fix override
mosuem Dec 4, 2023
28de18c
Add health workflow
mosuem Dec 4, 2023
3d973fe
Do not test breaking changes
mosuem Dec 5, 2023
7b6abb1
Remove health workflow
mosuem Dec 5, 2023
3b28ad8
Switch to dart script
mosuem Dec 5, 2023
223aabc
Fix path
mosuem Dec 5, 2023
1b7cd26
Add newlines
mosuem Dec 5, 2023
d683fcf
Fixes
mosuem Dec 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 2 additions & 5 deletions .github/workflows/native.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,11 +63,8 @@ jobs:
ndk-version: r26b
if: ${{ matrix.sdk == 'stable' }}

- run: dart pub get -C ../../tools/
if: ${{ matrix.dependencies == 'path' }}

- run: dart ../../tools/bin/change_dependencies.dart
if: ${{ matrix.dependencies == 'path' }}
- run: dart run ../../tools/delete_pubspec_overrides.dart
if: ${{ matrix.dependencies == 'published' }}

- run: dart pub get

Expand Down
3 changes: 3 additions & 0 deletions pkgs/native_assets_builder/pubspec_overrides.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
dependency_overrides:
native_assets_cli:
path: ../native_assets_cli/
3 changes: 3 additions & 0 deletions pkgs/native_assets_builder/test/data/cyclic_package_1/pubspec_overrides.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
dependency_overrides:
native_assets_cli:
path: ../../../../native_assets_cli/
3 changes: 3 additions & 0 deletions pkgs/native_assets_builder/test/data/cyclic_package_2/pubspec_overrides.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
dependency_overrides:
native_assets_cli:
path: ../../../../native_assets_cli/
5 changes: 5 additions & 0 deletions pkgs/native_assets_builder/test/data/native_add/pubspec_overrides.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
dependency_overrides:
native_assets_cli:
path: ../../../../native_assets_cli/
native_toolchain_c:
path: ../../../../native_toolchain_c/
5 changes: 5 additions & 0 deletions pkgs/native_assets_builder/test/data/native_add_add_source/pubspec_overrides.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
dependency_overrides:
native_assets_cli:
path: ../../../../native_assets_cli/
native_toolchain_c:
path: ../../../../native_toolchain_c/
5 changes: 5 additions & 0 deletions pkgs/native_assets_builder/test/data/native_subtract/pubspec_overrides.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
dependency_overrides:
native_assets_cli:
path: ../../../../native_assets_cli/
native_toolchain_c:
path: ../../../../native_toolchain_c/
3 changes: 3 additions & 0 deletions pkgs/native_assets_builder/test/data/package_reading_metadata/pubspec_overrides.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
dependency_overrides:
native_assets_cli:
path: ../../../../native_assets_cli/
3 changes: 3 additions & 0 deletions pkgs/native_assets_builder/test/data/package_with_metadata/pubspec_overrides.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
dependency_overrides:
native_assets_cli:
path: ../../../../native_assets_cli/
3 changes: 3 additions & 0 deletions pkgs/native_assets_builder/test/data/wrong_build_output/pubspec_overrides.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
dependency_overrides:
native_assets_cli:
path: ../../../../native_assets_cli/
3 changes: 3 additions & 0 deletions pkgs/native_assets_builder/test/data/wrong_build_output_2/pubspec_overrides.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
dependency_overrides:
native_assets_cli:
path: ../../../../native_assets_cli/
3 changes: 3 additions & 0 deletions pkgs/native_assets_builder/test/data/wrong_build_output_3/pubspec_overrides.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
dependency_overrides:
native_assets_cli:
path: ../../../../native_assets_cli/
3 changes: 3 additions & 0 deletions pkgs/native_assets_builder/test/data/wrong_namespace_asset/pubspec_overrides.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
dependency_overrides:
native_assets_cli:
path: ../../../../native_assets_cli/
5 changes: 5 additions & 0 deletions pkgs/native_assets_cli/example/native_add_library/pubspec_overrides.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
dependency_overrides:
native_assets_cli:
path: ../../../native_assets_cli/
native_toolchain_c:
path: ../../../native_toolchain_c/
mosuem marked this conversation as resolved.
Show resolved Hide resolved
3 changes: 3 additions & 0 deletions pkgs/native_toolchain_c/pubspec_overrides.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
dependency_overrides:
native_assets_cli:
path: ../native_assets_cli/
9 changes: 0 additions & 9 deletions tools/.gitignore
View file
Open in desktop

This file was deleted.

52 changes: 0 additions & 52 deletions tools/bin/change_dependencies.dart
View file
Open in desktop

This file was deleted.

6 changes: 6 additions & 0 deletions tools/delete_pubspec_overrides.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
import 'dart:io';
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess we have 0 package dependencies in this script, so no pubspec is needed? it feels a bit weird though.

Does it mean this script always has to be the latest language version for example?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I never use pubspecs on scripts :D It just means no restrictions on the SDK used, right?

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Which could mean it stops working on Dart 4.0 ?

Fine with me either way. 4.0 is far out =P


void main(List<String> arguments) => Directory.current
.list(recursive: true)
.where((f) => f.path.endsWith('pubspec_overrides.yaml'))
.forEach((f) => f.deleteSync());
14 changes: 0 additions & 14 deletions tools/pubspec.yaml
View file
Open in desktop

This file was deleted.