diff --git a/ci/dockerfiles/mjackets-build/Dockerfile b/ci/dockerfiles/mjackets-build/Dockerfile index d1a510e..cef5018 100644 --- a/ci/dockerfiles/mjackets-build/Dockerfile +++ b/ci/dockerfiles/mjackets-build/Dockerfile @@ -1,5 +1,9 @@ -FROM ubuntu:20.04 -LABEL maintainer="RoboJackets commit-sha/value + path: sh + task: get-commit-sha + + - load_var: commit + file: commit-sha/value + format: trim + reveal: true + + - inputs: [] put: build-check - config: image_resource: source: repository: robojackets/mjackets-dev - type: docker-image + type: registry-image inputs: - name: mjackets-api params: - SONAR_TOKEN: ((sonarcloud-io)) + SONAR_TOKEN: ((kv/"sonarcloud.io")) platform: linux run: args: - -exc - | - set -e - ls cd mjackets-api cmake configure . -D BOARD=MTRAIN build-wrapper-linux-x86-64 --out-dir bw-output make @@ -98,31 +126,27 @@ jobs: on_abort: inputs: - build-check - - mjackets-api params: conclusion: cancelled put: build-check on_error: inputs: - build-check - - mjackets-api params: conclusion: action_required put: build-check on_failure: inputs: - build-check - - mjackets-api params: conclusion: failure summary: Review the output within Concourse. title: Sanity build failed put: build-check task: build - + - inputs: - build-check - - mjackets-api params: conclusion: success summary: mJackets sanity build compiled sucessfully. @@ -134,15 +158,38 @@ jobs: - get: mjackets-api trigger: true - - inputs: - - mjackets-api + - config: + image_resource: + source: + repository: alpine/git + type: registry-image + inputs: + - name: mjackets-api + outputs: + - name: commit-sha + platform: linux + run: + args: + - -e + - -x + - -c + - git -C mjackets-api rev-parse HEAD > commit-sha/value + path: sh + task: get-commit-sha + + - load_var: commit + file: commit-sha/value + format: trim + reveal: true + + - inputs: [] put: documentation-check - + - config: image_resource: source: repository: robojackets/mjackets-dev - type: docker-image + type: registry-image inputs: - name: mjackets-api platform: linux @@ -150,8 +197,7 @@ jobs: args: - -exc - | - set -e - cd mjackets-api/docs + cd mjackets-api/docs cmake configure . make python ../utilities/doxy-coverage/doxy-coverage.py docs_build/doxygen_docs/xml/ --threshold 100 @@ -159,37 +205,33 @@ jobs: on_abort: inputs: - documentation-check - - mjackets-api params: conclusion: cancelled put: documentation-check on_error: inputs: - documentation-check - - mjackets-api params: conclusion: action_required put: documentation-check on_failure: inputs: - documentation-check - - mjackets-api params: conclusion: failure summary: Review the output within Concourse. - title: Insuffient API Documenation Coverage + title: Insufficent API Documentation Coverage put: documentation-check task: documentation-coverage - inputs: - documentation-check - - mjackets-api params: conclusion: success summary: mJackets API has 100% documentation coverage. title: 100% API Documentation Coverage put: documentation-check - + - name: build-pull-request plan: @@ -197,34 +239,38 @@ jobs: params: integration_tool: checkout list_changed_files: true + submodules: true trigger: true version: every - - inputs: - - pull-request + - load_var: commit + file: pull-request/.git/resource/head_sha + format: trim + reveal: true + + - load_var: pull_request_key + file: pull-request/.git/resource/pr + format: trim + reveal: true + + - inputs: [] put: build-check - config: image_resource: source: repository: robojackets/mjackets-dev - type: docker-image + type: registry-image inputs: - name: pull-request params: - SONAR_TOKEN: ((sonarcloud-io)) + SONAR_TOKEN: ((kv/"sonarcloud.io")) + PULL_REQUEST_KEY: ((.:pull_request_key)) platform: linux run: args: - -exc - | - set -e - apt install jq -y - cd pull-request - PULL_REQUEST_KEY=`jq '.pr' .git/resource/version.json` - PULL_REQUEST_KEY="${PULL_REQUEST_KEY%\"}" - PULL_REQUEST_KEY="${PULL_REQUEST_KEY#\"}" - git submodule init && git submodule update cmake configure . -D BOARD=MTRAIN build-wrapper-linux-x86-64 --out-dir bw-output make sonar-scanner \ @@ -237,24 +283,22 @@ jobs: -Dsonar.scm.disabled=false \ -Dsonar.pullrequest.key=$PULL_REQUEST_KEY path: sh + dir: pull-request on_abort: inputs: - build-check - - pull-request params: conclusion: cancelled put: build-check on_error: inputs: - build-check - - pull-request params: conclusion: action_required put: build-check on_failure: inputs: - build-check - - pull-request params: conclusion: failure summary: Review the output within Concourse. @@ -264,7 +308,6 @@ jobs: - inputs: - build-check - - pull-request params: conclusion: success summary: mJackets sanity build compiled sucessfully. @@ -280,15 +323,19 @@ jobs: trigger: true version: every - - inputs: - - pull-request + - load_var: commit + file: pull-request/.git/resource/head_sha + format: trim + reveal: true + + - inputs: [] put: documentation-check - config: image_resource: source: repository: robojackets/mjackets-dev - type: docker-image + type: registry-image inputs: - name: pull-request platform: linux @@ -296,44 +343,37 @@ jobs: args: - -exc - | - set -e - ls - cd pull-request/docs cmake configure . make python ../utilities/doxy-coverage/doxy-coverage.py docs_build/doxygen_docs/xml/ --threshold 100 path: sh + dir: pull-request/docs on_abort: inputs: - documentation-check - - pull-request params: conclusion: cancelled put: documentation-check on_error: inputs: - documentation-check - - pull-request params: conclusion: action_required put: documentation-check on_failure: inputs: - documentation-check - - pull-request params: conclusion: failure summary: Review the output within Concourse. - title: Insuffient API Documentation Coverage + title: Insufficent API Documentation Coverage put: documentation-check task: documentation-coverage - inputs: - documentation-check - - pull-request params: conclusion: success summary: mJackets API has 100% documentation coverage. - title: 100% Documenation Coverage + title: 100% Documentation Coverage put: documentation-check - diff --git a/ci/scripts/documentation_coverage.sh b/ci/scripts/documentation_coverage.sh deleted file mode 100755 index e69de29..0000000