From 29cf0a095141e5ddbc00a2f69090f24788180493 Mon Sep 17 00:00:00 2001 From: "Andrew Revinsky (DART)" Date: Thu, 22 Apr 2021 23:37:03 +0300 Subject: [PATCH] #5: Create CI configuration and a build script - corrected a typo ('artifact' < 'artefact') --- .circleci/config.yml | 4 ++-- build-and-test-all.sh | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index a2a84eb..1246c5a 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -8,11 +8,11 @@ jobs: - checkout - run: command: | - export CI_ARTEFACTS_PATH=~/ftgo-consumer-web-ui/ci-artefacts | + export CI_ARTIFACTS_PATH=~/ftgo-consumer-web-ui/ci-artifacts | export JEST_JUNIT_OUTPUT_DIR_PARENT=~/ftgo-consumer-web-ui/reports | ./build-and-test-all.sh - store_test_results: path: ~/ftgo-consumer-web-ui/reports - store_artifacts: - path: ~/ftgo-consumer-web-ui/ci-artefacts + path: ~/ftgo-consumer-web-ui/ci-artifacts diff --git a/build-and-test-all.sh b/build-and-test-all.sh index af74564..8ba5340 100755 --- a/build-and-test-all.sh +++ b/build-and-test-all.sh @@ -22,11 +22,11 @@ if [[ -z "$JEST_JUNIT_OUTPUT_DIR" ]]; then mkdir -p "$JEST_JUNIT_OUTPUT_DIR" fi -if [[ -z "$CI_ARTEFACTS_PATH" ]]; then - export CI_ARTEFACTS_PATH=$(pwd)/ci-artefacts/ - mkdir -p "$CI_ARTEFACTS_PATH" +if [[ -z "$CI_ARTIFACTS_PATH" ]]; then + export CI_ARTIFACTS_PATH=$(pwd)/ci-artifacts/ + mkdir -p "$CI_ARTIFACTS_PATH" fi -mkdir -p "$CI_ARTEFACTS_PATH/npm-logs" +mkdir -p "$CI_ARTIFACTS_PATH/npm-logs" echo "" @@ -58,9 +58,9 @@ echo "" echo "" echo "50. Archiving and copying the resulted built files" -tar -czvf "$CI_ARTEFACTS_PATH/build_$(date '+%Y%m%d_%H%M').tar.gz" build +tar -czvf "$CI_ARTIFACTS_PATH/build_$(date '+%Y%m%d_%H%M').tar.gz" build cp ./junit.xml "$JEST_JUNIT_OUTPUT_DIR/junit_$(date '+%Y%m%d_%H%M').xml" 2>/dev/null || : echo "Copy NPM logs" -[ -d "$HOME/.npm/_logs" ] && cp -R ~/.npm/_logs/* "$CI_ARTEFACTS_PATH/npm-logs" 2>/dev/null || : +[ -d "$HOME/.npm/_logs" ] && cp -R ~/.npm/_logs/* "$CI_ARTIFACTS_PATH/npm-logs" 2>/dev/null || :