diff --git a/Makefile b/Makefile index 18768dd4..dc07a5b1 100644 --- a/Makefile +++ b/Makefile @@ -13,7 +13,7 @@ SRAM_LIB_GIT_REPO ?= https://github.com/vlsida/sky130_fd_bd_sram.git # Use this for development #SRAM_LIB_GIT_REPO ?= git@github.com:VLSIDA/sky130_fd_bd_sram.git #SRAM_LIB_GIT_REPO ?= https://github.com/google/skywater-pdk-libs-sky130_fd_bd_sram.git -SRAM_LIB_GIT_COMMIT ?= 060f3638be6269dd9aa82cfbbdfd9525943c1582 +SRAM_LIB_GIT_COMMIT ?= 9fcf3a78398037583b6d6c1ebac71957343c4bd8 # Open PDKs OPEN_PDKS_DIR ?= $(PDK_ROOT)/open_pdks diff --git a/VERSION b/VERSION index 3b781da9..d20e7484 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.2.27 +1.2.30 diff --git a/compiler/characterizer/stimuli.py b/compiler/characterizer/stimuli.py index 45997b7e..c4aa92a9 100644 --- a/compiler/characterizer/stimuli.py +++ b/compiler/characterizer/stimuli.py @@ -410,7 +410,7 @@ class stimuli(): # FIXME: Should use verify/run_script.py here but run_script doesn't return # the return code of the subprocess. File names might also mismatch. from openram import CONDA_HOME - cmd = "source {0}/bin/activate && {1} && conda deactivate".format(CONDA_HOME, cmd) + cmd = "/bin/bash -c 'source {0}/bin/activate && {1} && conda deactivate'".format(CONDA_HOME, cmd) debug.info(2, cmd) proc = subprocess.run(cmd, stdout=spice_stdout, stderr=spice_stderr, shell=True)