From 62113a02bf98ff4d4177b0a86b091b654e942ee5 Mon Sep 17 00:00:00 2001 From: andrewbrazzatti Date: Mon, 12 Aug 2024 13:15:35 +0930 Subject: [PATCH] Fixed syntax for codecov branch parameter value --- .circleci/config.yml | 4 ++-- support/unit-testing/angular/testAngular.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index befbdae53..a0049c4e1 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -102,10 +102,10 @@ jobs: command: | /tmp/.codecov-cli/codecov --verbose upload-process --fail-on-error --disable-search \ --token "${CODECOV_TOKEN}" --name "job-${CIRCLE_BUILD_NUM}-${CIRCLE_TAG:-$CIRCLE_BRANCH}" \ - --flag "backend-bruno" --file "./coverage/bruno/lcov.info" --branch "${CIRCLE_TAG:-CIRCLE_BRANCH}" + --flag "backend-bruno" --file "./coverage/bruno/lcov.info" --branch "${CIRCLE_TAG:-$CIRCLE_BRANCH}" /tmp/.codecov-cli/codecov --verbose upload-process --fail-on-error --disable-search \ --token "${CODECOV_TOKEN}" --name "job-${CIRCLE_BUILD_NUM}-${CIRCLE_TAG:-$CIRCLE_BRANCH}" \ - --flag "backend-mocha" --file "./coverage/mocha/lcov.info" --branch "${CIRCLE_TAG:-CIRCLE_BRANCH}" + --flag "backend-mocha" --file "./coverage/mocha/lcov.info" --branch "${CIRCLE_TAG:-$CIRCLE_BRANCH}" when: always - run: name: Run angular tests diff --git a/support/unit-testing/angular/testAngular.sh b/support/unit-testing/angular/testAngular.sh index e337e9b53..934cfced1 100644 --- a/support/unit-testing/angular/testAngular.sh +++ b/support/unit-testing/angular/testAngular.sh @@ -10,7 +10,7 @@ function testAngular() { node_modules/.bin/ng t --browsers=ChromeHeadless "@researchdatabox/${1}" --no-watch --no-progress --code-coverage /tmp/.codecov-cli/codecov --verbose upload-process --fail-on-error --disable-search \ --token "${CODECOV_TOKEN}" --name "job-${CIRCLE_BUILD_NUM}-${CIRCLE_TAG:-$CIRCLE_BRANCH}" \ - --flag "${2}" --file "./projects/researchdatabox/${1}/coverage/coverage-final.json" --branch "${CIRCLE_TAG:-CIRCLE_BRANCH}" + --flag "${2}" --file "./projects/researchdatabox/${1}/coverage/coverage-final.json" --branch "${CIRCLE_TAG:-$CIRCLE_BRANCH}" } export NVM_DIR="$HOME/.nvm" [ -s "$HOME/.nvm/nvm.sh" ] && . "$HOME/.nvm/nvm.sh"