deleting spacing, add ci test, fixing merge error

.gitlab-ci.yml

@@ -0,0 +1,20 @@
+default: 
+    image: ubuntu:latest
+    before_script:
+        - apt-get update && apt-get install -y git wget make gcc curl
+        - git checkout ci_test 
+        - git pull origin ci_test
+        - chmod +x ./install_conda.sh
+        - ./install_conda.sh
+        - echo "export OPENRAM_HOME="/builds/asic_non_nda/openramenhanced/compiler"" >> ~/.bashrc
+        - echo "export OPENRAM_TECH="/builds/asic_non_nda/openramenhance/technology"" >> ~/.bashrc
+        - echo "export PYTHONPATH=$OPENRAM_HOME" >> ~/.bashrc
+        - source ~/.bashrc 
+        - source miniconda/bin/activate
+        - make sky130-pdk
+        - make sky130-install
+    script:
+        - pwd
+        - cd ./macros
+        - make sky130_sram_1rw_tiny
+            

compiler/base/hierarchy_layout.py

@@ -2171,7 +2171,7 @@ class layout():
                     pin = self.add_power_pin(name="vdd",
                                              loc=loc,
                                              start_layer="li")
-                elif route_option == "fast":
+                elif route_option == "quality":
                     pin = self.add_power_pin_m2(name="vdd",
                                                 loc=loc,
                                                 start_layer="li")
@@ -2197,7 +2197,7 @@ class layout():
                     pin = self.add_power_pin(name="vdd",
                                              loc=loc,
                                              start_layer="li")
-                elif route_option == "fast":
+                elif route_option == "quality":
                     pin = self.add_power_pin_m2(name="vdd",
                                                 loc=loc,
                                                 start_layer="li")

compiler/modules/sram_1bank.py

@@ -1135,7 +1135,7 @@ class sram_1bank(design, verilog, lef):
         if OPTS.route_supplies:
             if route_option == "classic":
                 self.route_supplies(init_bbox)
-            else: # quality
+            elif route_option == "quality": # quality
                 self.route_supplies_constructive(init_bbox)
 
     def route_dffs(self, add_routes=True):