Merge remote-tracking branch 'origin/main' into klayout-docs

2023-07-12 17:21:56 -07:00
parent 6f90102770 54536ed717
commit 59699dde61
16 changed files with 861 additions and 665 deletions
--- a/conda-reqs/chipyard.yaml
+++ b/conda-reqs/chipyard.yaml
@@ -23,8 +23,8 @@ dependencies:
    # bundle FireSim driver with deps into installer shell-script
    - constructor

-    - gcc
-    - gxx
+    - gcc<13
+    - gxx<13
    - sysroot_linux-64=2.17 # needed to match pre-built CI XRT glibc version
    - conda-gcc-specs
    - binutils
--- a/conda-reqs/conda-lock-reqs/conda-requirements-esp-tools-linux-64.conda-lock.yml
+++ b/conda-reqs/conda-lock-reqs/conda-requirements-esp-tools-linux-64.conda-lock.yml
--- a/conda-reqs/conda-lock-reqs/conda-requirements-riscv-tools-linux-64.conda-lock.yml
+++ b/conda-reqs/conda-lock-reqs/conda-requirements-riscv-tools-linux-64.conda-lock.yml