simplify github action, update npm commands

Author: DmitryBorisov-sm

.github/workflows/pull_request.yml

@@ -24,10 +24,8 @@ jobs:
       matrix:
         test:
           - name: "unit"
-          - name: "integration"
-            cluster: "v5"
-          - name: "integration"
-            cluster: "v4"
+          - name: "integration:v5"
+          - name: "integration:v4"
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -37,17 +35,17 @@ jobs:
           node-version: "22"
       - name: Install Dependencies
         run: npm ci
-      - name: Run ${{ matrix.test.name }}${{ matrix.test.cluster }} Tests and Add Annotations
-        run: npm run test:${{ matrix.test.name }} -- --ci --reporters=default --reporters=github-actions --reporters=jest-junit
+      - name: Run ${{matrix.test.name}} Tests and Add Annotations
+        run: npm run test:${{matrix.test.name}} -- --ci --reporters=default --reporters=github-actions --reporters=jest-junit
         env:
-          CONDUCTOR_SERVER_URL: ${{ matrix.test.cluster == 'v4' && vars.SERVER_URL_V4 || vars.SERVER_URL }}
-          CONDUCTOR_AUTH_KEY: ${{ matrix.test.cluster == 'v4' && secrets.AUTH_KEY_V4 || secrets.AUTH_KEY }}
-          CONDUCTOR_AUTH_SECRET: ${{ matrix.test.cluster == 'v4' && secrets.AUTH_SECRET_V4 || secrets.AUTH_SECRET }}
-          JEST_JUNIT_OUTPUT_NAME: ${{ matrix.test.name }}${{ matrix.test.cluster }}-test-results.xml
-      - name: Publish ${{ matrix.test.name }} Test Results
+          CONDUCTOR_SERVER_URL: ${{matrix.test.name == 'integration:v4' && vars.SERVER_URL_V4 || vars.SERVER_URL}}
+          CONDUCTOR_AUTH_KEY: ${{matrix.test.name == 'integration:v4' && secrets.AUTH_KEY_V4 || secrets.AUTH_KEY}}
+          CONDUCTOR_AUTH_SECRET: ${{matrix.test.name == 'integration:v4' && secrets.AUTH_SECRET_V4 || secrets.AUTH_SECRET}}
+          JEST_JUNIT_OUTPUT_NAME: ${{matrix.test.name}}-test-results.xml
+      - name: Publish ${{matrix.test.name}} Test Results
         uses: dorny/test-reporter@v2
-        if: ${{ !cancelled() }}
+        if: ${{!cancelled()}}
         with:
-          name: ${{ matrix.test.name }} Test Report
-          path: reports/${{ matrix.test.name }}${{ matrix.test.cluster }}-test-results.xml
+          name: ${{matrix.test.name}} Test Report
+          path: reports/${{matrix.test.name}}-test-results.xml
           reporter: jest-junit

package.json

@@ -47,7 +47,8 @@
     "lint-fix": "npx eslint . --fix",
     "test": "jest --force-exit --detectOpenHandles",
     "test:unit": "jest --testMatch='**/src/**/__tests__/**/*.test.[jt]s?(x)' --force-exit",
-    "test:integration": "jest --testMatch='**/integration-tests/**/*.test.[jt]s?(x)' --force-exit --detectOpenHandles",
+    "test:integration:v5": "jest --testMatch='**/integration-tests/{common,v5-only}/**/*.test.[jt]s?(x)' --force-exit --detectOpenHandles",
+    "test:integration:v4": "jest --testMatch='**/integration-tests/common/**/*.test.[jt]s?(x)' --force-exit --detectOpenHandles",
     "ci": "npm run lint && npm run test",
     "build": "tsup index.ts",
     "generateClient:models": "npx openapi-typescript-codegen --input  http://localhost:8080/api-docs --output src/common/open-api --client node --indent 2 --name ConductorClient --useUnionTypes --exportCore false",