From 12e68ac7225bd24c44776dde4485d57b9d66d800 Mon Sep 17 00:00:00 2001 From: Ben Mitchinson Date: Mon, 6 Apr 2020 12:25:36 -0500 Subject: [PATCH 1/3] readme - command edit --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index a56db9d..d302249 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ The application runs on docker, which can be installed [here](https://docs.docker.com/install/). If you're a linux user, you'll also need to install [docker-compose](https://docs.docker.com/compose/install/) separately. Otherwise, it's included in the Mac and PC versions of "Docker Desktop" -- The PWA and accompanying database can be started by running the command `docker-compose -f dev-docker-compose.yml up` from the root directory. - - `docker-compose -f dev-docker-compose.yml up` will then stop the docker processes from running in the background. +- The PWA, API, Database, and Swagger documentation can be started by running the command `docker-compose -f dev-docker-compose.yml up` from the root directory. + - `docker-compose -f dev-docker-compose.yml down` will then stop the docker processes from running in the background. - Once the images have been built and the processes started, the PWA can be seen at your localhost, at the port specified in [dev-docker-compose.yml](https://github.com/Haiti-Distributed-Healthcare-System/hdhs/blob/dev/dev-docker-compose.yml). - More tips to troubleshoot docker are available [here](https://github.com/Haiti-Distributed-Healthcare-System/hdhs/wiki/Using-Docker). From 86faefa280a878508cc92b2e5551422891288351 Mon Sep 17 00:00:00 2001 From: Ben Mitchinson Date: Mon, 6 Apr 2020 12:25:56 -0500 Subject: [PATCH 2/3] remove lighthouse from actions --- .github/workflows/lighthouse.yml | 25 ------------------------- .lighthouserc.json | 11 ----------- 2 files changed, 36 deletions(-) delete mode 100644 .github/workflows/lighthouse.yml delete mode 100644 .lighthouserc.json diff --git a/.github/workflows/lighthouse.yml b/.github/workflows/lighthouse.yml deleted file mode 100644 index 39d1eef..0000000 --- a/.github/workflows/lighthouse.yml +++ /dev/null @@ -1,25 +0,0 @@ -name: Build project and Run Lighthouse CI -on: [push] -jobs: - lhci: - name: Lighthouse CI - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v1 - - name: Use Node.js 10.x - uses: actions/setup-node@v1 - with: - node-version: 10.x - - name: npm install, build - run: | - pushd pwa && npm install - npm run build && popd - - name: run Lighthouse CI - run: | - npm install -g @lhci/cli@0.3.x - lhci autorun || echo "LHCI failed!" - - name: Upload lighthouse report - uses: actions/upload-artifact@v1 - with: - name: lighthouse - path: ./.lighthouseci \ No newline at end of file diff --git a/.lighthouserc.json b/.lighthouserc.json deleted file mode 100644 index ac5854c..0000000 --- a/.lighthouserc.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "ci": { - "collect": { - "staticDistDir": "./pwa/build", - "numberOfRuns": 3 - }, - "upload": { - "target": "temporary-public-storage" - } - } -} \ No newline at end of file From 95ca0472c8fdd6ef8ed14af1e0842d62d86dad91 Mon Sep 17 00:00:00 2001 From: Ben Mitchinson Date: Mon, 6 Apr 2020 12:32:29 -0500 Subject: [PATCH 3/3] run build with tests --- .github/workflows/pwa-tests.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/pwa-tests.yml b/.github/workflows/pwa-tests.yml index 02198c3..0c2f807 100644 --- a/.github/workflows/pwa-tests.yml +++ b/.github/workflows/pwa-tests.yml @@ -19,6 +19,7 @@ jobs: - run: docker-compose -f dev-docker-compose.yml up --detach - run: docker exec haiti_pwa npm run test:cov - run: docker exec haiti_pwa npm run cy:run + - run: docker exec haiti_pwa npm run build - run: docker-compose -f dev-docker-compose.yml down env: CI: true