From 640114a678d2f35530c63a01abcaa063bb750794 Mon Sep 17 00:00:00 2001 From: Martin Kourim Date: Mon, 2 Sep 2024 13:49:58 +0200 Subject: [PATCH] fix: handle conway era in regression script Updated the regression script to handle the conway era correctly. Now, if either TX_ERA or CLUSTER_ERA is set to "conway", TX_ERA will be unset and COMMAND_ERA will be set to "conway". This ensures proper handling of the conway era in the script. --- .github/regression.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/regression.sh b/.github/regression.sh index 48ff43912..98d45dc54 100755 --- 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