update variables | add more repos to commit check

This commit is contained in:
abejgonzalez
2019-07-09 16:31:36 -07:00
parent 4963b607e1
commit f5a3ff3ac5
4 changed files with 19 additions and 5 deletions

View File

@@ -6,9 +6,13 @@
# turn echo on and error on earliest command # turn echo on and error on earliest command
set -ex set -ex
# get shared variables
SCRIPT_DIR="$( cd "$( dirname "$0" )" && pwd )"
source $SCRIPT_DIR/defaults.sh
if [ ! -d "$HOME/$1-install" ]; then if [ ! -d "$HOME/$1-install" ]; then
cd $HOME cd $HOME
# init all submodules including the tools # init all submodules including the tools
CHIPYARD_DIR=$HOME/project ./project/scripts/build-toolchains.sh $1 CHIPYARD_DIR=$LOCAL_CHIPYARD_DIR .$LOCAL_CHIPYARD_DIR/scripts/build-toolchains.sh $1
fi fi

View File

@@ -5,8 +5,12 @@
# turn echo on and error on earliest command # turn echo on and error on earliest command
set -ex set -ex
# get shared variables
SCRIPT_DIR="$( cd "$( dirname "$0" )" && pwd )"
source $SCRIPT_DIR/defaults.sh
# enter bhd repo # enter bhd repo
cd $HOME/project cd $LOCAL_CHIPYARD_DIR
# initialize submodules and get the hashes # initialize submodules and get the hashes
git submodule update --init git submodule update --init
@@ -22,7 +26,7 @@ search () {
done done
} }
submodules=("boom" "hwacha" "rocket-chip" "sifive-blocks" "testchipip") submodules=("boom" "firechip" "hwacha" "icenet" "rocket-chip" "sifive-blocks" "sifive-cache" "testchipip")
dir="generators" dir="generators"
search search

View File

@@ -5,8 +5,12 @@
# turn echo on and error on earliest command # turn echo on and error on earliest command
set -ex set -ex
# get shared variables
SCRIPT_DIR="$( cd "$( dirname "$0" )" && pwd )"
source $SCRIPT_DIR/defaults.sh
# enter bhd repo # enter bhd repo
cd $HOME/project cd $LOCAL_CHIPYARD_DIR
# get the version of riscv-tools from the git submodule hash # get the version of riscv-tools from the git submodule hash
git submodule status | grep "riscv-tools" | awk '{print$1}' | grep -o "[[:alnum:]]*" >> $HOME/riscv-tools.hash git submodule status | grep "riscv-tools" | awk '{print$1}' | grep -o "[[:alnum:]]*" >> $HOME/riscv-tools.hash

View File

@@ -16,6 +16,7 @@ clean () {
# remote variables # remote variables
REMOTE_WORK_DIR=$CI_DIR/$CIRCLE_PROJECT_REPONAME-$CIRCLE_BRANCH-$CIRCLE_SHA1-$CIRCLE_JOB REMOTE_WORK_DIR=$CI_DIR/$CIRCLE_PROJECT_REPONAME-$CIRCLE_BRANCH-$CIRCLE_SHA1-$CIRCLE_JOB
REMOTE_RISCV_DIR=$REMOTE_WORK_DIR/riscv-tools-install REMOTE_RISCV_DIR=$REMOTE_WORK_DIR/riscv-tools-install
REMOTE_ESP_DIR=$REMOTE_WORK_DIR/esp-tools-install
REMOTE_CHIPYARD_DIR=$REMOTE_WORK_DIR/chipyard REMOTE_CHIPYARD_DIR=$REMOTE_WORK_DIR/chipyard
REMOTE_VERILATOR_DIR=$REMOTE_WORK_DIR/verilator REMOTE_VERILATOR_DIR=$REMOTE_WORK_DIR/verilator
REMOTE_SIM_DIR=$REMOTE_CHIPYARD_DIR/sims/verisim REMOTE_SIM_DIR=$REMOTE_CHIPYARD_DIR/sims/verisim
@@ -23,6 +24,7 @@ REMOTE_SIM_DIR=$REMOTE_CHIPYARD_DIR/sims/verisim
# local variables (aka within the docker container) # local variables (aka within the docker container)
LOCAL_CHECKOUT_DIR=$HOME/project LOCAL_CHECKOUT_DIR=$HOME/project
LOCAL_RISCV_DIR=$HOME/riscv-tools-install LOCAL_RISCV_DIR=$HOME/riscv-tools-install
LOCAL_CHIPYARD_DIR=$HOME/chipyard LOCAL_ESP_DIR=$HOME/esp-tools-install
LOCAL_CHIPYARD_DIR=$LOCAL_CHECKOUT_DIR
LOCAL_VERILATOR_DIR=$HOME/verilator LOCAL_VERILATOR_DIR=$HOME/verilator
LOCAL_SIM_DIR=$LOCAL_CHIPYARD_DIR/sims/verisim LOCAL_SIM_DIR=$LOCAL_CHIPYARD_DIR/sims/verisim