From 06dccdb588d6bd42b2ac337f3fcc2b9985e5df49 Mon Sep 17 00:00:00 2001 From: abejgonzalez Date: Tue, 29 Dec 2020 10:54:05 -0800 Subject: [PATCH 1/3] Organize check commit CI printout | Don't copy .git folder in CI --- .circleci/check-commit.sh | 16 +++++++++++----- .circleci/defaults.sh | 2 +- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/.circleci/check-commit.sh b/.circleci/check-commit.sh index 2660fa49..91ee9e80 100755 --- a/.circleci/check-commit.sh +++ b/.circleci/check-commit.sh @@ -124,19 +124,25 @@ search # turn off verbose printing to make this easier to read set +x -# print all result strings +# print 0's for str in "${all_names[@]}"; do - echo "$str" + if [ 0 = $(echo "$str" | awk '{print$3}') ]; then + echo "$str" + fi done -# check if there was a non-zero return code +echo "" + +# check if there was a non-zero return code and print 1's +EXIT=0 for str in "${all_names[@]}"; do if [ ! 0 = $(echo "$str" | awk '{print$3}') ]; then - exit 1 + echo "$str" + EXIT=1 fi done echo "Done checking all submodules" - +exit $EXIT diff --git a/.circleci/defaults.sh b/.circleci/defaults.sh index 12c4531f..11053f60 100755 --- a/.circleci/defaults.sh +++ b/.circleci/defaults.sh @@ -1,7 +1,7 @@ #!/bin/bash copy () { - rsync -avzp -e 'ssh' $1 $2 + rsync -avzp -e 'ssh' --exclude '.git' $1 $2 } run () { From 6f9dcf547863db05e4941a33f8ff5917e0611b76 Mon Sep 17 00:00:00 2001 From: abejgonzalez Date: Tue, 29 Dec 2020 20:51:29 -0800 Subject: [PATCH 2/3] Add new SSH key to access build server --- .circleci/config.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index f18f0e62..478ff315 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -49,6 +49,7 @@ commands: - add_ssh_keys: fingerprints: - "3e:c3:02:5b:ed:64:8c:b7:b0:04:43:bc:83:43:73:1e" + - "32:d6:89:d2:97:fa:db:de:a8:2d:2a:f2:70:dd:80:89" - checkout setup-tools: From ec1efc150e89e7c17aa0634a7cf32b318aa335a8 Mon Sep 17 00:00:00 2001 From: abejgonzalez Date: Tue, 29 Dec 2020 21:26:23 -0800 Subject: [PATCH 3/3] Add small comment --- .circleci/do-rtl-build.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/.circleci/do-rtl-build.sh b/.circleci/do-rtl-build.sh index 1e065437..316c9c6d 100755 --- a/.circleci/do-rtl-build.sh +++ b/.circleci/do-rtl-build.sh @@ -56,6 +56,7 @@ run "export RISCV=\"$TOOLS_DIR\"; \ read -a keys <<< ${grouping[$1]} +# need to set the PATH to use the new verilator (with the new verilator root) for key in "${keys[@]}" do run "export RISCV=\"$TOOLS_DIR\"; \