From 0e33bf4c0027e7bd08f97c2ccd0e6839f41ffb95 Mon Sep 17 00:00:00 2001
From: Mohamed Gaber <donn@efabless.com>
Date: Sun, 22 Sep 2024 12:29:48 +0300
Subject: [PATCH] hotfixes: TCL8_5_TM_PATH crash, CI pushing

---
 .github/workflows/openlane_ci.yml | 8 ++++----
 flow.tcl                          | 6 +++++-
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/openlane_ci.yml b/.github/workflows/openlane_ci.yml
index 325fad538..e09380768 100644
--- a/.github/workflows/openlane_ci.yml
+++ b/.github/workflows/openlane_ci.yml
@@ -281,12 +281,12 @@ jobs:
             docker load --input /tmp/image-$arch.tar
           done
 
-      - name: Create Tag (If scheduled or dispatched)
-        if: ${{ env.PUSHING == '1' && (github.event_name == 'schedule' || github.event_name == 'workflow_dispatch') && (env.BRANCH_NAME == vars.MAIN_BRANCH || env.BRANCH_NAME == 'superstable') }}
+      - name: Create Tag
+        if: ${{ env.PUSHING == '1' && (env.BRANCH_NAME == vars.MAIN_BRANCH || env.BRANCH_NAME == 'superstable') }}
         run: cd ${GITHUB_WORKSPACE}/ && python3 ${GITHUB_WORKSPACE}/.github/scripts/generate_tag.py
 
-      - name: Tag Commit (If scheduled or dispatched)
-        if: ${{ env.PUSHING == '1' && (github.event_name == 'schedule' || github.event_name == 'workflow_dispatch') && env.NEW_TAG != 'NO_NEW_TAG' }}
+      - name: Tag Commit
+        if: ${{ env.PUSHING == '1' && env.NEW_TAG != 'NO_NEW_TAG' }}
         uses: tvdias/github-tagger@v0.0.1
         with:
           tag: "${{ env.NEW_TAG }}"
diff --git a/flow.tcl b/flow.tcl
index 5f5054bfb..276c62de6 100755
--- a/flow.tcl
+++ b/flow.tcl
@@ -21,7 +21,11 @@ if { [file exists $::env(OPENLANE_ROOT)/install/env.tcl ] } {
 if { ! [info exists ::env(OPENROAD_BIN) ] } {
     set ::env(OPENROAD_BIN) openroad
 }
-set ::env(TCL8_5_TM_PATH) "$::env(OPENLANE_ROOT)/scripts:$::env(TCL8_5_TM_PATH)"
+if { [info exists ::env(TCL8_5_TM_PATH)] } {
+    set ::env(TCL8_5_TM_PATH) "$::env(OPENLANE_ROOT)/scripts:$::env(TCL8_5_TM_PATH)"
+} else {
+    set ::env(TCL8_5_TM_PATH) "$::env(OPENLANE_ROOT)/scripts"
+}
 package require openlane; # provides the utils as well
 
 proc run_placement_step {args} {