Generate all lockfiles at once

scripts/build-setup.sh

@@ -118,8 +118,8 @@ if run_step "1"; then
     LOCKFILE=$CONDA_LOCK_REQS/conda-requirements-$TOOLCHAIN_TYPE-linux-64.conda-lock.yml
 
     if [ "$USE_UNPINNED_DEPS" = true ]; then
-        # auto-gen the lockfile
+        # auto-gen the lockfiles
-        $CYDIR/scripts/generate-conda-lockfile.sh $TOOLCHAIN_TYPE
+        $CYDIR/scripts/generate-conda-lockfiles.sh
     fi
 
     # use conda-lock to create env

scripts/generate-conda-lockfile.sh

@@ -1,31 +0,0 @@
-#!/usr/bin/env bash
-
-set -ex
-
-CUR_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
-
-TOOLCHAIN_TYPE="riscv-tools"
-
-# getopts does not support long options, and is inflexible
-while [ "$1" != "" ];
-do
-    case $1 in
-        riscv-tools | esp-tools)
-            TOOLCHAIN_TYPE=$1 ;;
-        * )
-            error "invalid option $1"
-            usage 1 ;;
-    esac
-    shift
-done
-
-REQS_DIR="$CUR_DIR/../conda-reqs"
-if [ ! -d "$REQS_DIR" ]; then
-  echo "$REQS_DIR does not exist, make sure you're calling this script from chipyard/"
-  exit 1
-fi
-
-# note: lock file must end in .conda-lock.yml - see https://github.com/conda-incubator/conda-lock/issues/154
-LOCKFILE=$REQS_DIR/conda-lock-reqs/conda-requirements-$TOOLCHAIN_TYPE-linux-64.conda-lock.yml
-
-conda-lock -f "$REQS_DIR/chipyard.yaml" -f "$REQS_DIR/$TOOLCHAIN_TYPE.yaml" -p linux-64 --lockfile $LOCKFILE

scripts/generate-conda-lockfiles.sh

@@ -0,0 +1,18 @@
+#!/usr/bin/env bash
+
+set -ex
+
+CUR_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
+
+REQS_DIR="$CUR_DIR/../conda-reqs"
+if [ ! -d "$REQS_DIR" ]; then
+  echo "$REQS_DIR does not exist, make sure you're calling this script from chipyard/"
+  exit 1
+fi
+
+for TOOLCHAIN_TYPE in riscv-tools esp-tools; do
+    # note: lock file must end in .conda-lock.yml - see https://github.com/conda-incubator/conda-lock/issues/154
+    LOCKFILE=$REQS_DIR/conda-lock-reqs/conda-requirements-$TOOLCHAIN_TYPE-linux-64.conda-lock.yml
+
+    conda-lock -f "$REQS_DIR/chipyard.yaml" -f "$REQS_DIR/$TOOLCHAIN_TYPE.yaml" -p linux-64 --lockfile $LOCKFILE
+done