CI fixes

pusher · Dec 14, 2022 · c667e61 · c667e61
1 parent f2b2f22
commit c667e61
Show file tree

Hide file tree

Showing 7 changed files with 99 additions and 86 deletions.
diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
@@ -20,7 +20,13 @@ jobs:
       - run: npm install
       - run: npm run check-format
       - run: make web_unit
-      - run: make web_integration
+      - name: make web_integration
+        run: |
+          cd integration_tests_server
+          npm install
+          node index.js&
+          cd ..
+          make web_integration
         env:
           INTEGRATION_TESTS_APP_MT1_APP_ID: ${{ secrets.INTEGRATION_TESTS_APP_MT1_APP_ID }}
           INTEGRATION_TESTS_APP_MT1_KEY: ${{ secrets.INTEGRATION_TESTS_APP_MT1_KEY }}
@@ -40,7 +46,13 @@ jobs:
       - run: npm install
       - run: npm run check-format
       - run: make node_unit
-      - run: make node_integration
+      - name: make node_integration
+        run: |
+          cd integration_tests_server
+          npm install
+          node index.js&
+          cd ..
+          make node_integration
         env:
           INTEGRATION_TESTS_APP_MT1_APP_ID: ${{ secrets.INTEGRATION_TESTS_APP_MT1_APP_ID }}
           INTEGRATION_TESTS_APP_MT1_KEY: ${{ secrets.INTEGRATION_TESTS_APP_MT1_KEY }}

diff --git a/Makefile b/Makefile
@@ -51,7 +51,7 @@ web_unit:
 	node_modules/karma/bin/karma start spec/config/karma/unit.js
 
 .PHONY: web_integration
-web_integration: start_integration_test_server
+web_integration:
 	node_modules/karma/bin/karma start spec/config/karma/integration.js
 
 .PHONY: worker_unit
@@ -68,13 +68,10 @@ node_unit:
 	node_modules/.bin/jasmine --config=spec/config/jasmine/unit.json
 
 .PHONY: node_integration
-node_integration: start_integration_test_server
+node_integration:
 	node_modules/webpack/bin/webpack.js --config=spec/config/jasmine/webpack.integration.js && \
 	node_modules/.bin/jasmine --config=spec/config/jasmine/integration.json
 
-.PHONY: start_integration_test_server
-start_integration_test_server:
-	cd integration_tests_server; npm install; node index.js&
 
 .PHONY: serve
 serve:

diff --git a/dist/node/pusher.js b/dist/node/pusher.js
diff --git a/dist/node/pusher.js.map b/dist/node/pusher.js.map
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -64,6 +64,7 @@
   },
   "dependencies": {
     "tweetnacl": "^1.0.3",
-    "@types/node": "^14.14.31"
+    "@types/node": "^14.14.31",
+    "@types/express-serve-static-core": "4.17.28"
   }
 }