Skip to content

Commit

Permalink
chore(#8708): merge side service tests into main build
Browse files Browse the repository at this point in the history
  • Loading branch information
garethbowen authored Nov 19, 2023
1 parent 3729556 commit f4a5f11
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 25 deletions.
5 changes: 5 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,11 @@ jobs:
runs-on: ubuntu-22.04

steps:
- name: Install bats
run: |
sudo apt-get update
sudo apt-get install -y bats
- name: Login to Docker Hub
uses: docker/login-action@v2
with:
Expand Down
24 changes: 0 additions & 24 deletions .github/workflows/side-service-test.yml

This file was deleted.

4 changes: 3 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,12 @@
"unit-shared-lib": "UNIT_TEST_ENV=1 npm test --workspaces --if-present",
"unit-webapp": "UNIT_TEST_ENV=1 mocha 'webapp/tests/mocha/**/*.spec.js' && cd webapp && npm run unit -- --watch=false",
"unit-webapp-continuous": "cd webapp && npm run unit -- --watch=true",
"unit-nginx": "cd nginx/tests && make test",
"unit-haproxy": "cd haproxy/tests && make test",
"wdio-local": "export VERSION=$(node ./scripts/build/get-version.js) && ./scripts/build/build-service-images.sh && wdio run ./tests/e2e/default/wdio.conf.js",
"-- CI SCRIPTS ": "-----------------------------------------------------------------------------------------------",
"build": "./scripts/build/build-ci.sh",
"ci-compile": "node scripts/ci/check-versions.js && node scripts/build/cli npmCiModules && npm run lint && npm run build && npm run integration-api && npm run unit",
"ci-compile": "node scripts/ci/check-versions.js && node scripts/build/cli npmCiModules && npm run lint && npm run build && npm run integration-api && npm run unit && npm run unit-nginx && npm run unit-haproxy",
"ci-integration-all": "mocha --config tests/integration/.mocharc-all.js",
"ci-integration-sentinel": "mocha --config tests/integration/.mocharc-sentinel.js",
"ci-webdriver-default": "wdio run ./tests/e2e/default/wdio.conf.js",
Expand Down

0 comments on commit f4a5f11

Please sign in to comment.