diff --git a/backend/lib/app.js b/backend/lib/app.js index 004042d..3b5ac8d 100644 --- a/backend/lib/app.js +++ b/backend/lib/app.js @@ -9,7 +9,7 @@ export default async function (fastify) { openapi: { info: { title: 'CSAF Validator Service', - version: '1.3.3', + version: '1.3.4', description: 'This is a service to validate documents against the CSAF standard.', contact: { diff --git a/csaf-validator-lib/.github/workflows/publish-report.yml b/csaf-validator-lib/.github/workflows/publish-report.yml new file mode 100644 index 0000000..56e82a8 --- /dev/null +++ b/csaf-validator-lib/.github/workflows/publish-report.yml @@ -0,0 +1,33 @@ +name: 'Test Report' +on: + workflow_run: + workflows: ['Run Tests'] + types: + - completed +jobs: + report: + runs-on: ubuntu-latest + steps: + - name: Download workflow artifact + uses: dawidd6/action-download-artifact@v2.27.0 + with: + workflow: run-tests.yml + name: test-results + run_id: ${{ github.event.workflow_run.id }} + - name: Set pr number env + run: | + PR_NUMBER=$(cat pr_number) + echo "PR_NUMBER=$PR_NUMBER" >> $GITHUB_ENV + - name: Test Report + uses: phoenix-actions/test-reporting@v12 + id: test-report + with: + artifact: test-results + name: Mocha Tests + path: test-results.json + reporter: mocha-json + - name: c8 coverage report + uses: Nef10/lcov-reporter-action@v0.4.0 + with: + pr-number: ${{ env.PR_NUMBER }} + github-token: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file diff --git a/csaf-validator-lib/.github/workflows/github-actions.yml b/csaf-validator-lib/.github/workflows/run-tests.yml similarity index 57% rename from csaf-validator-lib/.github/workflows/github-actions.yml rename to csaf-validator-lib/.github/workflows/run-tests.yml index e60f03a..91d9087 100644 --- a/csaf-validator-lib/.github/workflows/github-actions.yml +++ b/csaf-validator-lib/.github/workflows/run-tests.yml @@ -16,16 +16,17 @@ jobs: node-version: 16 - run: npm ci - run: npm run test-report - - name: Test Report - uses: phoenix-actions/test-reporting@v8 - id: test-report - if: success() || failure() - with: - name: Mocha Tests - path: test-results.json - reporter: mocha-json - run: npm run test-coverage-lcov - - name: c8 coverage report - uses: romeovs/lcov-reporter-action@v0.2.16 + - name: Save PR number + env: + PR_NUMBER: ${{ github.event.number }} + run: | + echo $PR_NUMBER > ./pr_number + - uses: actions/upload-artifact@v3 + if: success() || failure() with: - github-token: ${{ secrets.GITHUB_TOKEN }} + name: test-results + path: | + test-results.json + coverage + pr_number diff --git a/csaf-validator-lib/package-lock.json b/csaf-validator-lib/package-lock.json index 97e1596..4af009f 100644 --- a/csaf-validator-lib/package-lock.json +++ b/csaf-validator-lib/package-lock.json @@ -1,12 +1,12 @@ { "name": "csaf-validator-lib", - "version": "1.3.1", + "version": "1.3.5", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "csaf-validator-lib", - "version": "1.3.1", + "version": "1.3.5", "license": "MIT", "dependencies": { "ajv": "^8.11.2", @@ -16,8 +16,8 @@ "json-pointer": "^0.6.1", "lodash": "^4.17.21", "packageurl-js": "^1.0.2", - "semver": "^7.5.0", - "undici": "^5.22.0" + "semver": "^7.4.0", + "undici": "^5.22.1" }, "devDependencies": { "@types/chai": "^4.3.4", @@ -1246,9 +1246,9 @@ "dev": true }, "node_modules/semver": { - "version": "7.5.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.0.tgz", - "integrity": "sha512-+XC0AD/R7Q2mPSRuy2Id0+CGTZ98+8f+KvwirxOKIEyid+XSx6HbC63p+O4IndTHuX5Z+JxQ0TghCkO5Cg/2HA==", + "version": "7.4.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.4.0.tgz", + "integrity": "sha512-RgOxM8Mw+7Zus0+zcLEUn8+JfoLpj/huFTItQy2hsM4khuC1HYRDp0cU482Ewn/Fcy6bCjufD8vAj7voC66KQw==", "dependencies": { "lru-cache": "^6.0.0" }, @@ -1424,9 +1424,9 @@ } }, "node_modules/undici": { - "version": "5.22.0", - "resolved": "https://registry.npmjs.org/undici/-/undici-5.22.0.tgz", - "integrity": "sha512-fR9RXCc+6Dxav4P9VV/sp5w3eFiSdOjJYsbtWfd4s5L5C4ogyuVpdKIVHeW0vV1MloM65/f7W45nR9ZxwVdyiA==", + "version": "5.22.1", + "resolved": "https://registry.npmjs.org/undici/-/undici-5.22.1.tgz", + "integrity": "sha512-Ji2IJhFXZY0x/0tVBXeQwgPlLWw13GVzpsWPQ3rV50IFMMof2I55PZZxtm4P6iNq+L5znYN9nSTAq0ZyE6lSJw==", "dependencies": { "busboy": "^1.6.0" }, diff --git a/csaf-validator-lib/package.json b/csaf-validator-lib/package.json index 1dc3cf6..239d85e 100644 --- a/csaf-validator-lib/package.json +++ b/csaf-validator-lib/package.json @@ -19,8 +19,8 @@ "json-pointer": "^0.6.1", "lodash": "^4.17.21", "packageurl-js": "^1.0.2", - "semver": "^7.5.0", - "undici": "^5.22.0" + "semver": "^7.4.0", + "undici": "^5.22.1" }, "devDependencies": { "@types/chai": "^4.3.4", @@ -38,5 +38,5 @@ "typescript": "^4.9.4", "xml2js": "^0.5.0" }, - "version": "1.3.1" + "version": "1.3.5" } diff --git a/documents/generated/asciidoc/.openapi-generator/VERSION b/documents/generated/asciidoc/.openapi-generator/VERSION index 4be2c72..cd802a1 100644 --- a/documents/generated/asciidoc/.openapi-generator/VERSION +++ b/documents/generated/asciidoc/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0 \ No newline at end of file diff --git a/documents/generated/asciidoc/index.adoc b/documents/generated/asciidoc/index.adoc index 97f0f71..45786a5 100644 --- a/documents/generated/asciidoc/index.adoc +++ b/documents/generated/asciidoc/index.adoc @@ -1,6 +1,6 @@ = CSAF Validator Service secvisogram@bsi.bund.de -1.3.3 +1.3.4 :toc: left :numbered: :toclevels: 3 diff --git a/documents/generated/html/.openapi-generator/VERSION b/documents/generated/html/.openapi-generator/VERSION index 4be2c72..cd802a1 100644 --- a/documents/generated/html/.openapi-generator/VERSION +++ b/documents/generated/html/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0 \ No newline at end of file diff --git a/documents/generated/html/index.html b/documents/generated/html/index.html index eb831a6..14265ef 100644 --- a/documents/generated/html/index.html +++ b/documents/generated/html/index.html @@ -183,7 +183,7 @@