Merge pull request #1587 from nextcloud/refactor/ci/use-melos-test

nextcloud · Feb 10, 2024 · cca6e81 · cca6e81
2 parents efa25f6 + 69bbf12
commit cca6e81
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/.github/workflows/dart.yml b/.github/workflows/dart.yml
@@ -43,5 +43,4 @@ jobs:
           if [ -z "$packages" ]; then exit 0; fi
           packages_glob="$(printf ",%s" "${packages[@]}")"
           packages_glob="${packages_glob:1}"
-          melos exec --scope="$packages_glob" --flutter --concurrency=1 --fail-fast --dir-exists=test -- "flutter test --concurrency=$(nproc --all)"
-          melos exec --scope="$packages_glob" --no-flutter --concurrency=1 --fail-fast --dir-exists=test -- "dart test --concurrency=$(nproc --all)"
+          MELOS_PACKAGES="$packages_glob" melos test
diff --git a/melos.yaml b/melos.yaml
@@ -35,6 +35,6 @@ scripts:
   analyze: dart analyze --fatal-infos .
   test: >
     melos exec --no-flutter --concurrency=1 --fail-fast --dir-exists=test -- "dart test --concurrency=$(nproc --all) --fail-fast" &&
-    melos exec --flutter --concurrency=1 --fail-fast --dir-exists=test -- "flutter test --concurrency=$(nproc --all) --fail-fast"
+    melos exec --flutter --concurrency=1 --fail-fast --dir-exists=test -- "flutter test --concurrency=$(nproc --all)"
   generate:neon:build_runner: melos exec --scope="neon*" --file-exists="build.yaml" -- dart run build_runner build --delete-conflicting-outputs && melos run format
   generate:neon:l10n: melos exec --flutter --dir-exists="lib/l10n" flutter gen-l10n && melos run format