From cde5e037725b5945fc79c0ed4bcc66061af9d721 Mon Sep 17 00:00:00 2001 From: Jacob Brown Date: Tue, 4 Nov 2025 10:20:40 -0700 Subject: [PATCH 1/3] fix: make run_bdd operational on windows --- run_bdd.sh | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/run_bdd.sh b/run_bdd.sh index 490be82e2..8fd24a39f 100755 --- a/run_bdd.sh +++ b/run_bdd.sh @@ -15,7 +15,13 @@ if [ ! -d ".venv" ]; then echo "🧱 Creating virtual environment..." python3 -m venv venv fi -source .venv/bin/activate + +# bin for Unix, Scripts for Windows +if [ -d ".venv/bin" ]; then + source .venv/bin/activate +else + source .venv/Scripts/activate +fi # Install dependencies echo "📦 Installing Python dependencies..." From e02ce4f26b57b6581074a07d6982382ac184b44a Mon Sep 17 00:00:00 2001 From: Jacob Brown Date: Tue, 4 Nov 2025 10:25:54 -0700 Subject: [PATCH 2/3] fix: make run_bdd operational on windows --- run_bdd.sh | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/run_bdd.sh b/run_bdd.sh index 8fd24a39f..a214aaaa6 100755 --- a/run_bdd.sh +++ b/run_bdd.sh @@ -42,7 +42,13 @@ fi # Copy backend features echo "📋 Syncing backend features..." mkdir -p tests/features -rsync -a ../OcotilloBDD/features/backend/ tests/features/ +if [[ "$OSTYPE" == "msys" || "$OSTYPE" == "win32" || "$OSTYPE" == "win64" || "$OSTYPE" == "cygwin" ]]; then + # Windows + cp -r ../OcotilloBDD/features/backend/. tests/features/ +else + # Unix/Linux/Mac + rsync -a ../OcotilloBDD/features/backend/ tests/features/ +fi # Run Behave tests echo "🚀 Running Behave tests..." From c2b3888cb1d59ab046052332fdbdf500c79ea524 Mon Sep 17 00:00:00 2001 From: Jacob Brown Date: Tue, 4 Nov 2025 10:36:36 -0700 Subject: [PATCH 3/3] fix: checkout main branch for feature tests --- run_bdd.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/run_bdd.sh b/run_bdd.sh index a214aaaa6..eb1eaa57f 100755 --- a/run_bdd.sh +++ b/run_bdd.sh @@ -36,7 +36,7 @@ if [ ! -d "../OcotilloBDD" ]; then git clone https://github.com/DataIntegrationGroup/OcotilloBDD.git ../OcotilloBDD else echo "🔄 Updating existing BDD repository..." - cd ../OcotilloBDD && git pull && cd - >/dev/null + cd ../OcotilloBDD && git checkout main && git pull && cd - >/dev/null fi # Copy backend features