diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 042c6f60..bb08a7e8 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -27,26 +27,17 @@ jobs: cd $GITHUB_WORKSPACE/weaver-ui npm run publish:local - - name: "Install Chrome Drivers" - run: sudo apt-get install xvfb - - name: "Node Cache" uses: actions/cache@v3 with: path: ~/.npm - key: ${{ runner.os }}-cache-node-${{ hashFiles('**/package.json', '**/package-lock.json') }} + key: ${{ runner.os }}-cache-node-${{ hashFiles('**/package.json') }} - name: "Node Modules Cache" uses: actions/cache@v3 with: path: $GITHUB_WORKSPACE/repo/node_modules - key: ${{ runner.os }}-cache-node_modules-${{ hashFiles('**/package.json', '**/package-lock.json') }} - - - name: "Maven Cache" - uses: actions/cache@v3 - with: - path: ~/.m2/repository - key: ${{ runner.os }}-cache-maven-${{ hashFiles('**/pom.xml') }} + key: ${{ runner.os }}-cache-node_modules-${{ hashFiles('**/package.json') }} - name: "Setup Node" uses: actions/setup-node@v3 @@ -54,9 +45,11 @@ jobs: node-version: 16 - name: "Setup Java" - uses: actions/setup-java@v1 + uses: actions/setup-java@v3 with: java-version: 11 + distribution: 'adopt' + cache: 'maven' - name: "Maven Test" env: diff --git a/lighthouserc.json b/lighthouserc.json index 9d9f44c5..a825946a 100644 --- a/lighthouserc.json +++ b/lighthouserc.json @@ -5,7 +5,9 @@ "collect": { "numberOfRuns": 1, "url": ["http://localhost:9000/"], - "startServerCommand": "mvn spring-boot:run" + "startServerCommand": "mvn spring-boot:run", + "startServerReadyPattern": "Started CapApplication", + "startServerReadyTimeout": 90000 }, "assert": { "assertions": { diff --git a/scripts/build-lighthouse-badges.js b/scripts/build-lighthouse-badges.js index 918d0d73..a5faf2d2 100644 --- a/scripts/build-lighthouse-badges.js +++ b/scripts/build-lighthouse-badges.js @@ -4,7 +4,6 @@ const https = require('https'); const fs = require('fs-extra'); const glob = require("glob"); -const ghPagesPath = `src/main/resources/gh-pages`; const lighthousePath = `src/main/resources/gh-pages/audit`; const lighthouseAssetsPath = `${lighthousePath}/assets`; const lighthouseCiPath = './.lighthouseci'; diff --git a/src/main/resources/gh-pages/.gitignore b/src/main/resources/gh-pages/.gitignore new file mode 100644 index 00000000..1a4aeedf --- /dev/null +++ b/src/main/resources/gh-pages/.gitignore @@ -0,0 +1 @@ +audit/ diff --git a/src/main/resources/gh-pages/audit/assets/accessibility.svg b/src/main/resources/gh-pages/audit/assets/accessibility.svg deleted file mode 100644 index df9c08c7..00000000 --- a/src/main/resources/gh-pages/audit/assets/accessibility.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/main/resources/gh-pages/audit/assets/best-practices.svg b/src/main/resources/gh-pages/audit/assets/best-practices.svg deleted file mode 100644 index 251ab4d0..00000000 --- a/src/main/resources/gh-pages/audit/assets/best-practices.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/main/resources/gh-pages/audit/assets/performance.svg b/src/main/resources/gh-pages/audit/assets/performance.svg deleted file mode 100644 index c2c7c9ec..00000000 --- a/src/main/resources/gh-pages/audit/assets/performance.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/main/resources/gh-pages/audit/assets/pwa.svg b/src/main/resources/gh-pages/audit/assets/pwa.svg deleted file mode 100644 index 8661e855..00000000 --- a/src/main/resources/gh-pages/audit/assets/pwa.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/main/resources/gh-pages/audit/assets/seo.svg b/src/main/resources/gh-pages/audit/assets/seo.svg deleted file mode 100644 index 6d1616d3..00000000 --- a/src/main/resources/gh-pages/audit/assets/seo.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/main/resources/gh-pages/audit/index.html b/src/main/resources/gh-pages/audit/index.html deleted file mode 100644 index 0a23e5ce..00000000 --- a/src/main/resources/gh-pages/audit/index.html +++ /dev/null @@ -1,7572 +0,0 @@ - - - -
- - - -
-