Merge pull request #2593 from IntersectMBO/set_conway_command_era

fix: handle conway era in regression script
IntersectMBO · Sep 2, 2024 · 36d7448 · 36d7448
2 parents 97e67b2 + 640114a
commit 36d7448
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/.github/regression.sh b/.github/regression.sh
@@ -104,11 +104,11 @@ fi
 export CLUSTER_ERA
 
 TX_ERA="${TX_ERA:-""}"
-if [ "$TX_ERA" = "default" ]; then
-  export TX_ERA=""
-elif [ "$TX_ERA" = "conway" ]; then
+if [ "$TX_ERA" = "conway" ] || [ "$CLUSTER_ERA" = "conway" ]; then
   unset TX_ERA
   export COMMAND_ERA="conway"
+elif [ "$TX_ERA" = "default" ]; then
+  export TX_ERA=""
 fi
 
 if [ -n "${BOOTSTRAP_DIR:-""}" ]; then