Merge pull request #1662 from ucb-bar/vlsi-fixes

Hammer bump and minor VLSI fixes
ucb-bar · Nov 15, 2023 · bfa822a · bfa822a
2 parents c90d054 + 842c9f0
commit bfa822a
Show file tree

Hide file tree

Showing 8 changed files with 510 additions and 536 deletions.
diff --git a/.github/workflows/chipyard-full-flow.yml b/.github/workflows/chipyard-full-flow.yml
@@ -124,7 +124,7 @@ jobs:
           conda config --add channels litex-hub
 
           # installs for example-sky130.yml
-          conda create -y --prefix ./.conda-sky130 open_pdks.sky130a=1.0.399_0_g63dbde9
+          conda create -y --prefix ./.conda-sky130 open_pdks.sky130a=1.0.457_0_g32e8f23
           git clone https://github.com/rahulk29/sram22_sky130_macros.git
 
           # installs for example-openroad.yml

diff --git a/conda-reqs/chipyard.yaml b/conda-reqs/chipyard.yaml
@@ -102,7 +102,7 @@ dependencies:
     - sty
     - open_pdks.sky130a
     - pip:
-        - hammer-vlsi[asap7]==1.1.2
+        - hammer-vlsi[asap7]==1.2.0
 
     # doc requirements
     - sphinx