diff --git a/scripts/build-setup.sh b/scripts/build-setup.sh index c58ddd7b..35b19a82 100755 --- a/scripts/build-setup.sh +++ b/scripts/build-setup.sh @@ -134,23 +134,23 @@ function exit_if_last_command_failed # setup and install conda environment if run_step "1"; then begin_step "1" "Conda environment setup" - # note: lock file must end in .conda-lock.yml - see https://github.com/conda-incubator/conda-lock/issues/154 - CONDA_REQS=$CYDIR/conda-reqs - CONDA_LOCK_REQS=$CONDA_REQS/conda-lock-reqs - # must match with the file generated by generate-conda-lockfile.sh - LOCKFILE=$CONDA_LOCK_REQS/conda-requirements-$TOOLCHAIN_TYPE-linux-64.conda-lock.yml + # note: lock file must end in .conda-lock.yml - see https://github.com/conda-incubator/conda-lock/issues/154 + CONDA_REQS=$CYDIR/conda-reqs + CONDA_LOCK_REQS=$CONDA_REQS/conda-lock-reqs + # must match with the file generated by generate-conda-lockfile.sh + LOCKFILE=$CONDA_LOCK_REQS/conda-requirements-$TOOLCHAIN_TYPE-linux-64.conda-lock.yml - if [ "$USE_UNPINNED_DEPS" = true ]; then - # auto-gen the lockfiles - $CYDIR/scripts/generate-conda-lockfiles.sh - exit_if_last_command_failed - fi + if [ "$USE_UNPINNED_DEPS" = true ]; then + # auto-gen the lockfiles + $CYDIR/scripts/generate-conda-lockfiles.sh + exit_if_last_command_failed + fi - # use conda-lock to create env - conda-lock install --conda $(which conda) -p $CYDIR/.conda-env $LOCKFILE && + # use conda-lock to create env + conda-lock install --conda $(which conda) -p $CYDIR/.conda-env $LOCKFILE && - source $CYDIR/.conda-env/etc/profile.d/conda.sh && - conda activate $CYDIR/.conda-env + source $CYDIR/.conda-env/etc/profile.d/conda.sh && + conda activate $CYDIR/.conda-env exit_if_last_command_failed fi @@ -187,25 +187,25 @@ fi # run ctags for code navigation if run_step "4"; then begin_step "4" "Running ctags for code navigation" - $CYDIR/scripts/gen-tags.sh + $CYDIR/scripts/gen-tags.sh exit_if_last_command_failed fi # precompile chipyard scala sources if run_step "5"; then begin_step "5" "Pre-compiling Chipyard Scala sources" - pushd $CYDIR/sims/verilator - make launch-sbt SBT_COMMAND=";project chipyard; compile" - make launch-sbt SBT_COMMAND=";project tapeout; compile" - popd + pushd $CYDIR/sims/verilator + make launch-sbt SBT_COMMAND=";project chipyard; compile" + make launch-sbt SBT_COMMAND=";project tapeout; compile" + popd exit_if_last_command_failed fi # setup firesim if run_step "6"; then begin_step "6" "Setting up FireSim" - $CYDIR/scripts/firesim-setup.sh - $CYDIR/sims/firesim/gen-tags.sh + $CYDIR/scripts/firesim-setup.sh + $CYDIR/sims/firesim/gen-tags.sh exit_if_last_command_failed # precompile firesim scala sources