Ad4mModel Refactor

.circleci/config.yml

@@ -44,9 +44,8 @@ commands:
           name: Build bootstrap languages
           command: pnpm run build-languages
 
-
 jobs:
-  build-and-test:
+  build:
     machine: true
     resource_class: coasys/marvin
     steps:
@@ -99,44 +98,59 @@ jobs:
           command: pnpm test
           no_output_timeout: 30m
 
-  integration-tests-js:
+  integration-tests-core:
     machine: true
     resource_class: coasys/marvin
+    environment:
+      # Unique port range for this job's setup executor so it never conflicts
+      # with integration-tests-multi-user running concurrently on the
+      # same self-hosted runner (both jobs run after build in parallel).
+      AD4M_SETUP_GQL_PORT: "15700"
+      AD4M_SETUP_HC_ADMIN_PORT: "15701"
+      AD4M_SETUP_HC_APP_PORT: "15702"
     steps:
       - setup_integration_test_environment
       - run:
           name: Kill any orphaned executors from previous runs
           command: |
             # Self-hosted runners reuse workdirs; previous job may have left
             # an executor alive (exec() shell-wrap means kill() only kills
-            # the shell, not the executor grandchild). Clear ports before test.
+            # the shell, not the executor grandchild). Clear our port range.
             for port in 15700 15701 15702; do
-              lsof -ti:$port | xargs -r kill -9 2>/dev/null || true
+              lsof -ti:$port -s TCP:LISTEN | xargs -r kill -9 2>/dev/null || true
             done
+            sleep 1
+      - run:
+          name: Prepare test environment
+          command: cd ./tests/js && pnpm run prepare-test
+          no_output_timeout: 20m
       - run:
           name: Run integration tests
-          command: cd ./tests/js && pnpm run test-main
+          command: cd ./tests/js && pnpm run test:ci
           no_output_timeout: 30m
 
-  integration-tests-multi-user-simple:
+  integration-tests-multi-user:
     machine: true
     resource_class: coasys/marvin
+    environment:
+      # Unique port range for this job's setup executor — offset by 10 from
+      # integration-tests-core to prevent conflicts when both jobs run in parallel.
+      AD4M_SETUP_GQL_PORT: "15710"
+      AD4M_SETUP_HC_ADMIN_PORT: "15711"
+      AD4M_SETUP_HC_APP_PORT: "15712"
     steps:
       - setup_integration_test_environment
       - run:
-          name: Run multi-user-simple integration tests
-          command: cd ./tests/js && ./test-multi-user-with-setup.sh
-          no_output_timeout: 30m
-
-  integration-tests-email-verification:
-    machine: true
-    resource_class: coasys/marvin
-    steps:
-      - setup_integration_test_environment
+          name: Kill any orphaned executors from previous runs
+          command: |
+            for port in 15710 15711 15712; do
+              lsof -ti:$port -s TCP:LISTEN | xargs -r kill -9 2>/dev/null || true
+            done
+            sleep 1
       - run:
-          name: Run email-verification integration tests
-          command: cd ./tests/js && ./email-verification-test-with-setup.sh
-          no_output_timeout: 30m
+          name: Run multi-user integration tests
+          command: cd ./tests/js && pnpm run test-multi-user
+          no_output_timeout: 60m
 
   integration-tests-cli:
     machine: true
@@ -164,13 +178,10 @@ workflows:
   version: 2
   build-and-test:
     jobs:
-      - build-and-test
-      - integration-tests-js:
-          requires:
-            - build-and-test
-      - integration-tests-multi-user-simple:
+      - build
+      - integration-tests-core:
           requires:
-            - build-and-test
-      - integration-tests-email-verification:
+            - build
+      - integration-tests-multi-user:
           requires:
-            - build-and-test
+            - build

.github/workflows/publish.yml

@@ -437,14 +437,6 @@ jobs:
           tag: ${{ env.NPM_TAG }}
           access: public
 
-      - name: Publish ad4m hook helpers
-        uses: JS-DevTools/npm-publish@v1
-        with:
-          token: ${{ secrets.COASYS_NPM_TOKEN }}
-          package: ad4m-hooks/helpers/package.json
-          tag: ${{ env.NPM_TAG }}
-          access: public
-
       - name: Publish ad4m react hooks
         uses: JS-DevTools/npm-publish@v1
         with:

.github/workflows/publish_staging.yml

@@ -592,7 +592,7 @@ jobs:
           TAG="${{ env.NPM_TAG }}"
           echo "Publishing with tag: $TAG"
           FAILED=0
-          for PKG in core connect ad4m-hooks/helpers ad4m-hooks/react ad4m-hooks/vue executor test-runner; do
+          for PKG in core connect ad4m-hooks/react ad4m-hooks/vue test-runner; do
             echo "=== Publishing $PKG ==="
             set +e
             OUTPUT=$(cd "$PKG" && npm publish --access public --tag "$TAG" --registry https://registry.npmjs.org 2>&1)

.vscode/settings.json

@@ -0,0 +1 @@
+{}