diff --git a/.dx/group_vars/all.yml b/.dx/group_vars/all.yml index a3895fd8..432a2077 100644 --- a/.dx/group_vars/all.yml +++ b/.dx/group_vars/all.yml @@ -1,4 +1,7 @@ --- +organization: smecalculus +project: bezmen + usage: toy prefs: turing @@ -27,16 +30,14 @@ focus: none binary_repo: local image_repo: local -image_group: smecalculus - app_images: - foo: "{{ image_repo }}/{{ image_group }}/app-foo" + foo: "{{ image_repo }}/{{ organization }}/{{ project }}/app/foo" schema_images: - postgres: "{{ image_repo }}/{{ image_group }}/schema-postgres" + postgres: "{{ image_repo }}/{{ organization }}/{{ project }}/schema/postgres" stack_images: - solution: "{{ image_repo }}/{{ image_group }}/solution-{{ usage }}-{{ prefs }}" - pipeline: "{{ image_repo }}/{{ image_group }}/pipeline-{{ environ }}" + solution: "{{ image_repo }}/{{ organization }}/{{ project }}/stack/solution-{{ usage }}-{{ prefs }}" + pipeline: "{{ image_repo }}/{{ organization }}/{{ project }}/stack/pipeline-{{ environ }}" docker_entity: "{{ 'image' if image_repo == 'local' else 'manifest' }}" diff --git a/.github/workflows/solution-convincing.yml b/.github/workflows/solution-convincing.yml index 5004310f..19cbbcf0 100644 --- a/.github/workflows/solution-convincing.yml +++ b/.github/workflows/solution-convincing.yml @@ -41,6 +41,7 @@ jobs: env: GITHUB_ACTOR: ${{ github.actor }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + # units reporting - uses: EnricoMi/publish-unit-test-result-action@v2.9.0 if: ${{ !cancelled() }} with: @@ -54,6 +55,22 @@ jobs: files: | libs/*/target/surefire-reports/TEST-*.xml apps/*/target/surefire-reports/TEST-*.xml + - uses: madrapps/jacoco-report@v1.6.1 + if: ${{ github.event_name == 'pull_request' && hashFiles(env.JACOCO_UNITS) != '' }} + with: + title: Unit Coverage Report + paths: ${{ env.JACOCO_UNITS }} + token: ${{ secrets.GITHUB_TOKEN }} + update-comment: true + env: + JACOCO_UNITS: .tools/target/coverage/units/jacoco.xml + - uses: actions/upload-artifact@v3.1.3 + if: ${{ !cancelled() }} + with: + name: units-coverage-report + path: .tools/target/coverage/units + if-no-files-found: ignore + # integrations reporting - uses: EnricoMi/publish-unit-test-result-action@v2.9.0 if: ${{ !cancelled() }} with: @@ -67,6 +84,22 @@ jobs: files: | libs/*/target/failsafe-reports/TEST-*.xml apps/*/target/failsafe-reports/TEST-*.xml + - uses: madrapps/jacoco-report@v1.6.1 + if: ${{ github.event_name == 'pull_request' && hashFiles(env.JACOCO_INTEGRATIONS) != '' }} + with: + title: Integration Coverage Report + paths: ${{ env.JACOCO_INTEGRATIONS }} + token: ${{ secrets.GITHUB_TOKEN }} + update-comment: true + env: + JACOCO_INTEGRATIONS: .tools/target/coverage/integrations/jacoco.xml + - uses: actions/upload-artifact@v3.1.3 + if: ${{ !cancelled() }} + with: + name: integrations-coverage-report + path: .tools/target/coverage/integrations + if-no-files-found: ignore + # fake e2e reporting - name: Always empty E2E test report. See https://github.com/orgs/community/discussions/13690 uses: EnricoMi/publish-unit-test-result-action@v2.9.0 if: ${{ !cancelled() }} @@ -79,21 +112,3 @@ jobs: job_summary: false comment_mode: off files: tests/*/target/surefire-reports/TEST-*.xml - - uses: madrapps/jacoco-report@v1.6 - if: ${{ github.event_name == 'pull_request' && hashFiles(env.JACOCO_UNITS) != '' }} - with: - title: Unit Coverage Report - paths: ${{ env.JACOCO_UNITS }} - token: ${{ secrets.GITHUB_TOKEN }} - update-comment: true - env: - JACOCO_UNITS: .tools/target/coverage/units/jacoco.xml - - uses: madrapps/jacoco-report@v1.6 - if: ${{ github.event_name == 'pull_request' && hashFiles(env.JACOCO_INTEGRATIONS) != '' }} - with: - title: Integration Coverage Report - paths: ${{ env.JACOCO_INTEGRATIONS }} - token: ${{ secrets.GITHUB_TOKEN }} - update-comment: true - env: - JACOCO_INTEGRATIONS: .tools/target/coverage/integrations/jacoco.xml diff --git a/.github/workflows/solution-sanity.yml b/.github/workflows/solution-sanity.yml index 48c92ecf..86bc7c07 100644 --- a/.github/workflows/solution-sanity.yml +++ b/.github/workflows/solution-sanity.yml @@ -48,7 +48,7 @@ jobs: files: | libs/*/target/surefire-reports/TEST-*.xml apps/*/target/surefire-reports/TEST-*.xml - - uses: madrapps/jacoco-report@v1.6 + - uses: madrapps/jacoco-report@v1.6.1 if: ${{ github.event_name == 'pull_request' && hashFiles(env.JACOCO_UNITS) != '' }} with: title: Unit Coverage Report