npm: remove test:report, central --report flag in workspaces.py

haraldschilly · haraldschilly · commit a399033a5ace · 2025-07-22T15:42:48.000+02:00
diff --git a/.github/workflows/make-and-test.yml b/.github/workflows/make-and-test.yml
@@ -108,7 +108,6 @@ jobs:
 
 
       - name: install pnpm
-        #run: cd src && npm install -g pnpm
         uses: pnpm/action-setup@v4
         with:
           version: 10
@@ -117,8 +116,10 @@ jobs:
       - name: build
         run: cd src && pnpm run make
 
+      # This runs all the tests with text output and jest-junit reporters to generate junit.xml reports
+      # That test-github-ci target runs workspaces.py for testing, which in turn runs the depchecks
       - name: test
-        run: source venv/bin/activate && cd src && pnpm run test-github-ci:report
+        run: source venv/bin/activate && cd src && pnpm run test-github-ci --report
 
       - name: upload test results
         uses: actions/upload-artifact@v4  # upload test results
@@ -127,9 +128,6 @@ jobs:
           name: "test-results-node-${{ matrix.node-version }}-pg-${{ matrix.pg-version }}"
           path: 'src/packages/*/junit.xml'
 
-      - name: dependency check
-        run: cd src && pnpm run depcheck
-
   report:
     runs-on: ubuntu-latest
 
diff --git a/src/package.json b/src/package.json
@@ -19,7 +19,6 @@
     "test-parallel": "unset DEBUG && pnpm run version-check && cd packages && pnpm run -r --parallel test",
     "test": "unset DEBUG && pnpm run depcheck && pnpm run version-check && ./workspaces.py test",
     "test-github-ci": "unset DEBUG && pnpm run depcheck && pnpm run version-check && ./workspaces.py test --exclude=jupyter,file-server --retries=1",
-    "test-github-ci:report": "pnpm run test-github-ci --report",
     "depcheck": "cd packages && pnpm run -r --parallel depcheck",
     "prettier-all": "cd packages/",
     "local-ci": "./scripts/ci.sh",
diff --git a/src/packages/assets/package.json b/src/packages/assets/package.json
@@ -11,7 +11,6 @@
     "preinstall": "npx only-allow pnpm",
     "build": "./build.sh",
     "test": "../node_modules/.bin/jest",
-    "test:report": "pnpm run test -- --reporters=default --reporters=jest-junit",
     "prepublishOnly": "pnpm test"
   },
   "keywords": ["cocalc"],
diff --git a/src/packages/backend/package.json b/src/packages/backend/package.json
@@ -20,9 +20,7 @@
     "build": "pnpm exec tsc --build",
     "tsc": "pnpm exec tsc --watch  --pretty --preserveWatchOutput",
     "test": "pnpm exec jest --forceExit",
-    "test:report": "pnpm run test -- --reporters=default --reporters=jest-junit",
     "test-conat": " pnpm exec jest --forceExit conat",
-    "test-conat:report": " pnpm exec jest --forceExit conat --reporters=default --reporters=jest-junit",
     "testp": "pnpm exec jest --forceExit",
     "depcheck": "pnpx depcheck --ignores events",
     "prepublishOnly": "pnpm test",
@@ -67,7 +65,6 @@
   },
   "homepage": "https://github.com/sagemathinc/cocalc/tree/master/src/packages/backend",
   "devDependencies": {
-    "@types/node": "^18.16.14",
-    "jest-junit": "^16.0.0"
+    "@types/node": "^18.16.14"
   }
 }
diff --git a/src/packages/cdn/package.json b/src/packages/cdn/package.json
@@ -16,7 +16,6 @@
     "build": "rm -rf build dist && mkdir build && cp -rv *.json *.py *.js build/ && cd build && npm ci && mkdir dist && ./setup.py && mv dist .. && cd .. && rm -rf build ",
     "postinstall": "./postinstall.js",
     "test": "../node_modules/.bin/jest",
-    "test:report": "pnpm run test -- --reporters=default --reporters=jest-junit",
     "prepublishOnly": "npm test"
   },
   "homepage": "https://github.com/sagemathinc/cocalc/tree/master/src/packages/cdn",
diff --git a/src/packages/conat/package.json b/src/packages/conat/package.json
@@ -22,7 +22,6 @@
     "clean": "rm -rf dist node_modules",
     "tsc": "pnpm exec tsc  --watch  --pretty --preserveWatchOutput",
     "test": "pnpm exec jest",
-    "test:report": "pnpm run test -- --reporters=default --reporters=jest-junit",
     "depcheck": "pnpx depcheck --ignores events"
   },
   "files": [
diff --git a/src/packages/database/package.json b/src/packages/database/package.json
@@ -38,16 +38,14 @@
     "@types/lodash": "^4.14.202",
     "@types/node": "^18.16.14",
     "@types/pg": "^8.6.1",
-    "coffeescript": "^2.5.1",
-    "jest-junit": "^16.0.0"
+    "coffeescript": "^2.5.1"
   },
   "scripts": {
     "preinstall": "npx only-allow pnpm",
     "build": "../node_modules/.bin/tsc  --build && coffee -c -o dist/ ./",
     "clean": "rm -rf dist",
     "tsc": "../node_modules/.bin/tsc --watch  --pretty --preserveWatchOutput",
     "test": "pnpm exec jest --forceExit --runInBand",
-    "test:report": "pnpm run test -- --reporters=default --reporters=jest-junit",
     "depcheck": "pnpx depcheck | grep -Ev '\\.coffee|coffee$'",
     "prepublishOnly": "pnpm test"
   },
diff --git a/src/packages/file-server/package.json b/src/packages/file-server/package.json
@@ -11,7 +11,6 @@
     "build": "pnpm exec tsc --build",
     "tsc": "pnpm exec tsc  --watch  --pretty --preserveWatchOutput",
     "test": "pnpm exec jest",
-    "test:report": "pnpm run test -- --reporters=default --reporters=jest-junit",
     "depcheck": "pnpx depcheck",
     "clean": "rm -rf node_modules dist"
   },
diff --git a/src/packages/frontend/package.json b/src/packages/frontend/package.json
@@ -175,7 +175,6 @@
     "build-coffee": "pnpm exec coffee -m -c -o dist/ .",
     "tsc": "NODE_OPTIONS=--max-old-space-size=8192 ../node_modules/.bin/tsc --watch --pretty --preserveWatchOutput ",
     "test": "jest",
-    "test:report": "pnpm run test -- --reporters=default --reporters=jest-junit",
     "depcheck": "pnpx depcheck --ignores cspell,@cspell/dict-typescript,events,@formatjs/cli | grep -Ev '\\.coffee|coffee$'",
     "prepublishOnly": "pnpm test",
     "update-color-scheme": "node ./update-color-scheme.js",
diff --git a/src/packages/hub/package.json b/src/packages/hub/package.json
@@ -49,8 +49,7 @@
   "devDependencies": {
     "@types/express": "^4.17.21",
     "@types/node": "^18.16.14",
-    "coffeescript": "^2.5.1",
-    "jest-junit": "^16.0.0"
+    "coffeescript": "^2.5.1"
   },
   "scripts": {
     "preinstall": "npx only-allow pnpm",
@@ -66,7 +65,6 @@
     "hub-docker-prod-nossl": "export DEBUG=${DEBUG:='cocalc:*,-cocalc:silly:*'} && COCALC_DOCKER=true NODE_ENV=production PROJECTS=/projects/[project_id] PORT=80 NODE_OPTIONS='--max_old_space_size=8000 --enable-source-maps' cocalc-hub-server --mode=multi-user --all --hostname=0.0.0.0",
     "tsc": "tsc --watch  --pretty --preserveWatchOutput",
     "test": "jest dist/",
-    "test:report": "pnpm run test -- --reporters=default --reporters=jest-junit",
     "depcheck": "pnpx depcheck | grep -Ev '\\.coffee|coffee$'",
     "prepublishOnly": "test"
   },
diff --git a/src/packages/jupyter/package.json b/src/packages/jupyter/package.json
@@ -24,7 +24,6 @@
     "build": "../node_modules/.bin/tsc --build",
     "clean": "rm -rf node_modules dist",
     "test": "pnpm exec jest --forceExit --maxWorkers=1",
-    "test:report": "pnpm run test -- --reporters=default --reporters=jest-junit",
     "depcheck": "pnpx depcheck",
     "tsc": "../node_modules/.bin/tsc --watch --pretty --preserveWatchOutput"
   },
diff --git a/src/packages/next/package.json b/src/packages/next/package.json
@@ -36,7 +36,6 @@
     "start": "unset PGHOST; pnpm exec next start",
     "start-project": "unset PGHOST PGUSER COCALC_ROOT; export PORT=5000 BASE_PATH=/$COCALC_PROJECT_ID/port/5000; echo https://cocalc.com$BASE_PATH; pnpm start",
     "test": "NODE_ENV='dev' pnpm exec jest",
-    "test:report": "pnpm run test -- --reporters=default --reporters=jest-junit",
     "test-api": "NODE_ENV='production' pnpm exec jest ./lib/api/framework.test.ts",
     "depcheck": "pnpx depcheck --ignores @openapitools/openapi-generator-cli,eslint-config-next,locales,components,lib,public,pages,software-inventory,pg",
     "prepublishOnly": "pnpm test",
diff --git a/src/packages/package.json b/src/packages/package.json
@@ -8,6 +8,7 @@
     "@types/jest": "^29.5.14",
     "check-dependency-version-consistency": "^5.0.0",
     "jest": "^29.7.0",
+    "jest-junit": "^16.0.0",
     "ts-jest": "^29.2.3",
     "typescript": "^5.7.3"
   },
diff --git a/src/packages/pnpm-lock.yaml b/src/packages/pnpm-lock.yaml
diff --git a/src/packages/project/package.json b/src/packages/project/package.json
@@ -69,7 +69,6 @@
     "build": "../node_modules/.bin/tsc --build",
     "tsc": "../node_modules/.bin/tsc  --watch  --pretty --preserveWatchOutput",
     "test": "COCALC_PROJECT_ID=812abe34-a382-4bd1-9071-29b6f4334f03 COCALC_USERNAME=user pnpm exec jest",
-    "test:report": "pnpm run test -- --reporters=default --reporters=jest-junit",
     "depcheck": "pnpx depcheck",
     "prepublishOnly": "pnpm test",
     "clean": "rm -rf dist"
diff --git a/src/packages/server/package.json b/src/packages/server/package.json
@@ -36,7 +36,6 @@
     "build": "../node_modules/.bin/tsc --build",
     "tsc": "../node_modules/.bin/tsc --watch --pretty --preserveWatchOutput ",
     "test": "TZ=UTC jest --forceExit --runInBand",
-    "test:report": "pnpm run test -- --reporters=default --reporters=jest-junit",
     "depcheck": "pnpx depcheck",
     "prepublishOnly": "test"
   },
diff --git a/src/packages/static/package.json b/src/packages/static/package.json
@@ -20,7 +20,6 @@
     "build-dev": "pnpm run build0 && NODE_ENV=development pnpm rspack build",
     "watch": "NO_RSPACK_DEV_SERVER=yes NODE_ENV=development pnpm rspack build -w",
     "test": "pnpm exec jest",
-    "test:report": "pnpm run test -- --reporters=default --reporters=jest-junit",
     "prepublishOnly": "pnpm test"
   },
   "repository": {
diff --git a/src/packages/sync-fs/package.json b/src/packages/sync-fs/package.json
@@ -20,7 +20,6 @@
     "tsc": "../node_modules/.bin/tsc --watch --pretty --preserveWatchOutput",
     "clean": "rm -rf node_modules dist",
     "test": "pnpm exec jest --forceExit --runInBand",
-    "test:report": "pnpm run test -- --reporters=default --reporters=jest-junit",
     "depcheck": "pnpx depcheck"
   },
   "author": "SageMath, Inc.",
diff --git a/src/packages/sync/package.json b/src/packages/sync/package.json
@@ -13,7 +13,6 @@
     "build": "../node_modules/.bin/tsc --build",
     "tsc": "../node_modules/.bin/tsc --watch --pretty --preserveWatchOutput",
     "test": "pnpm exec jest --forceExit",
-    "test:report": "pnpm run test -- --reporters=default --reporters=jest-junit",
     "depcheck": "pnpx depcheck --ignores events",
     "prepublishOnly": "pnpm test"
   },
diff --git a/src/packages/util/package.json b/src/packages/util/package.json
@@ -20,7 +20,6 @@
     "build": "pnpm exec tsc --build",
     "tsc": "pnpm exec tsc  --watch  --pretty --preserveWatchOutput",
     "test": "pnpm exec jest",
-    "test:report": "pnpm run test -- --reporters=default --reporters=jest-junit",
     "depcheck": "pnpx depcheck --ignores events",
     "prepublishOnly": "pnpm test"
   },
@@ -77,7 +76,6 @@
     "@types/node": "^18.16.14",
     "@types/seedrandom": "^3.0.8",
     "@types/uuid": "^8.3.1",
-    "jest-junit": "^16.0.0",
     "expect": "^26.6.2",
     "seedrandom": "^3.0.5",
     "tsd": "^0.22.0"
diff --git a/src/workspaces.py b/src/workspaces.py
@@ -305,7 +305,7 @@ def f():
             print("*" * 40)
             test_cmd = "pnpm run --if-present test"
             if args.report:
-                test_cmd += ":report"
+                test_cmd += " --reporters=default --reporters=jest-junit"
             cmd(test_cmd, package_path)
             success.append(path)
 
