diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml index 96c1fbeb..cd686d0e 100644 --- a/.github/workflows/node.js.yml +++ b/.github/workflows/node.js.yml @@ -24,7 +24,8 @@ jobs: node-version: ${{ matrix.node-version }} cache: 'npm' - run: npm ci - - run: npm test + - run: npm run test-stolaf-college + - run: npm run test-carleton-college lint: runs-on: ubuntu-latest diff --git a/package.json b/package.json index 8d81e42c..38192179 100644 --- a/package.json +++ b/package.json @@ -19,7 +19,9 @@ "start": "node -r dotenv/config source/ccc-server/index.js", "stolaf-college": "env INSTITUTION=stolaf-college npm start", "carleton-college": "env INSTITUTION=carleton-college npm start", - "test": "./scripts/smoke-all.sh" + "test-stolaf-college": "./scripts/smoke-test.sh stolaf-college", + "test-carleton-college": "./scripts/smoke-test.sh stolaf-college", + "test": "npm run test-stolaf-college; npm run test-carleton-college;" }, "dependencies": { "@sentry/node": "^7.113.0", diff --git a/scripts/smoke-all.sh b/scripts/smoke-all.sh deleted file mode 100644 index e1e05648..00000000 --- a/scripts/smoke-all.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash - -# exit the script if any command exits -set -ex -o pipefail - -bash ./scripts/smoke-test.sh stolaf-college -bash ./scripts/smoke-test.sh carleton-college