Merge pull request #2219 from ucb-bar/small-build-changes

small build setup edits to prevent common failures

Author: abejgonzalez

conda-reqs/chipyard-extended.yaml

@@ -69,7 +69,7 @@ dependencies:
 
     # hammer packages
     - sty
-    - open_pdks.sky130a
+    # - open_pdks.sky130a
     - pip:
         - hammer-vlsi[asap7]==1.2.0
 

conda-reqs/conda-lock-reqs/conda-requirements-riscv-tools-linux-64.conda-lock.yml

@@ -190,7 +190,9 @@ if run_step "1"; then
     fi
     echo "Storing main conda environment in $CONDA_ENV_NAME"
 
-    conda-lock install --conda $(which conda) $CONDA_ENV_ARG $LOCKFILE &&
+    conda-lock install --conda $CONDA_EXE $CONDA_ENV_ARG $LOCKFILE &&
+    ## If the above line errors in your environment, you can try the line below
+    # conda-lock install --conda $(which conda) $CONDA_ENV_ARG $LOCKFILE &&
     source $(conda info --base)/etc/profile.d/conda.sh &&
     conda activate $CONDA_ENV_NAME
     exit_if_last_command_failed