From dd5d9cbdb9e20d68b1b1cbcbe44752997bbda85e Mon Sep 17 00:00:00 2001 From: Gautier de Saint Martin Lacaze Date: Mon, 27 Apr 2020 17:44:54 +0200 Subject: [PATCH] Fix travis build --- .travis.yml | 10 ++++++---- sonarcloud/build-and-analyse-all.sh | 4 ++-- src/software/firmware/README.md | 16 ++++++++-------- 3 files changed, 16 insertions(+), 14 deletions(-) diff --git a/.travis.yml b/.travis.yml index c17f28aad..3274ce2a4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -32,8 +32,10 @@ cache: - "$HOME/.sonar/cache/respirator-production-HW2-dev" - "$HOME/.sonar/cache/respirator-qualification-HW1-dev" - "$HOME/.sonar/cache/respirator-qualification-HW2-dev" + +branches: + only: + - master + script: - - | - if [[ $TRAVIS_PULL_REQUEST_SLUG == "" || $TRAVIS_PULL_REQUEST_SLUG == "makers-for-life/makair" ]]; then - bash sonarcloud/build-and-analyse-all.sh - fi + - bash sonarcloud/build-and-analyse-all.sh diff --git a/sonarcloud/build-and-analyse-all.sh b/sonarcloud/build-and-analyse-all.sh index cded5373c..6e8793cd3 100755 --- a/sonarcloud/build-and-analyse-all.sh +++ b/sonarcloud/build-and-analyse-all.sh @@ -12,13 +12,13 @@ for softwareIndex in "${!softwareNames[@]}" do for hardwareIndex in "${!hardwareVersionNames[@]}" do - export SOFTWARE_FULLNAME="respirator-${softwareNames[$softwareIndex]}-${hardwareVersionNames[$hardwareIndex]}-dev" + export SOFTWARE_FULLNAME="respirator-${softwareNames[$softwareIndex]}-${hardwareVersionNames[$hardwareIndex]}" export MODE=${softwareModes[$softwareIndex]} export HARDWARE_VERSION=${hardwareVersions[$hardwareIndex]} path="build/${SOFTWARE_FULLNAME}/bo" - mkdir -p path + mkdir -p "$path" arduino-cli cache clean build-wrapper-linux-x86-64 --out-dir "$path" bash sonarcloud/build.sh > /dev/null diff --git a/src/software/firmware/README.md b/src/software/firmware/README.md index f47c1fb35..919c1a899 100644 --- a/src/software/firmware/README.md +++ b/src/software/firmware/README.md @@ -36,11 +36,11 @@ Low-level configuration options can be found in [includes/parameters.h](includes The following version of software are build and analysed. -| Software Mode | Hardware | Version | Valve version | Link | -| ---------------- | -------- | ------- | ------------- | --------------------------------------------------------------------------------------------------------------------------------------- | -| integration-test | HW1 | dev | pinch valve | [respirator-integration-test-HW1-dev](https://sonarcloud.io/organizations/makers-for-life/projects/respirator-integration-test-HW1-dev) | -| integration-test | HW2 | dev | pinch valve | [respirator-integration-test-HW2-dev](https://sonarcloud.io/organizations/makers-for-life/projects/respirator-integration-test-HW2-dev) | -| production | HW1 | dev | pinch valve | [respirator-production-HW1-dev](https://sonarcloud.io/organizations/makers-for-life/projects/respirator-production-HW1-dev) | -| production | HW2 | dev | pinch valve | [respirator-production-HW2-dev](https://sonarcloud.io/organizations/makers-for-life/projects/respirator-production-HW2-dev) | -| qualification | HW1 | dev | pinch valve | [respirator-qualification-HW1-dev](https://sonarcloud.io/organizations/makers-for-life/projects/respirator-qualification-HW1-dev) | -| qualification | HW2 | dev | pinch valve | [respirator-qualification-HW2-dev](https://sonarcloud.io/organizations/makers-for-life/projects/respirator-qualification-HW2-dev) | +| Software Mode | Hardware | Valve version | Link | +| ---------------- | -------- | ------------- | ----------------------------------------------------------------------------------------------------- | +| integration-test | HW1 | pinch valve | [respirator-integration-test-HW1](https://sonarcloud.io/dashboard?id=respirator-integration-test-HW1) | +| integration-test | HW2 | pinch valve | [respirator-integration-test-HW2](https://sonarcloud.io/dashboard?id=respirator-integration-test-HW2) | +| production | HW1 | pinch valve | [respirator-production-HW1](https://sonarcloud.io/dashboard?id=respirator-production-HW1) | +| production | HW2 | pinch valve | [respirator-production-HW2](https://sonarcloud.io/dashboard?id=respirator-production-HW2) | +| qualification | HW1 | pinch valve | [respirator-qualification-HW1](https://sonarcloud.io/dashboard?id=respirator-qualification-HW1) | +| qualification | HW2 | pinch valve | [respirator-qualification-HW2](https://sonarcloud.io/dashboard?id=respirator-qualification-HW2) |