diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index 38533cee..85367e9a 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -23,15 +23,30 @@ jobs: steps: - name: 📚 Git Checkout uses: actions/checkout@v4 + - uses: dorny/paths-filter@v3 + id: filter with: - fetch-depth: 0 + filters: | + dsfr: + - 'packages/dsfr.dart/**' - name: 🐦 Install flutter uses: subosito/flutter-action@v2 with: cache: true channel: stable flutter-version: ${{ env.FLUTTER_VERSION }} - - run: dart pub global activate melos - - run: melos run format_check_diff - - run: melos run analyze_diff - - run: melos run test_diff \ No newline at end of file + - name: ✅ Check app (format, lint, tests) + run: | + cd app + dart format $(find . -name '*.dart' -not -name '*.g.dart') --set-exit-if-changed + flutter analyze --fatal-infos --fatal-warnings + flutter test --test-randomize-ordering-seed random + cd - + - name: ✅ Check dsfr (format, lint, tests) + if: steps.filter.outputs.dsfr == 'true' + run: | + cd packages/dsfr.dart + dart format $(find . -name '*.dart' -not -name '*.g.dart') --set-exit-if-changed + flutter analyze --fatal-infos --fatal-warnings + flutter test --test-randomize-ordering-seed random + cd - \ No newline at end of file diff --git a/.vscode/settings.json b/.vscode/settings.json index 1a55fd22..924a5964 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -12,7 +12,6 @@ }, "files.exclude": { "**/pubspec.lock": true, - "**/pubspec_overrides.yaml": true, "**/.dart_tool/": true, "**/.flutter-plugins-dependencies": true, "**/.flutter-plugins": true, diff --git a/melos.yaml b/melos.yaml deleted file mode 100644 index b32f41a5..00000000 --- a/melos.yaml +++ /dev/null @@ -1,17 +0,0 @@ -name: melos - -ide: - intellij: - enabled: false - -packages: - - app - - packages/** - -scripts: - format_check_diff: - run: melos exec --diff=origin/main...HEAD --include-dependents dart format $(find . -name '*.dart' -not -name '*.g.dart') --set-exit-if-changed - analyze_diff: - run: melos exec --diff=origin/main...HEAD --include-dependents flutter analyze --fatal-infos --fatal-warnings - test_diff: - run: melos exec --diff=origin/main...HEAD --include-dependents flutter test --test-randomize-ordering-seed random \ No newline at end of file diff --git a/packages/dsfr.dart/example/pubspec.yaml b/packages/dsfr.dart/example/pubspec.yaml index e93fa191..121222af 100755 --- a/packages/dsfr.dart/example/pubspec.yaml +++ b/packages/dsfr.dart/example/pubspec.yaml @@ -14,8 +14,5 @@ dependencies: flutter: sdk: flutter -dev_dependencies: - flutter_test: - sdk: flutter flutter: uses-material-design: true \ No newline at end of file diff --git a/pubspec.yaml b/pubspec.yaml deleted file mode 100644 index f0ccee8c..00000000 --- a/pubspec.yaml +++ /dev/null @@ -1,6 +0,0 @@ -name: agir_melos - -environment: - sdk: 3.4.1 -dev_dependencies: - melos: ^6.0.0