From 6b2747a2f8f421b82eeea97bbaf572e4f6cae4ad Mon Sep 17 00:00:00 2001
From: Tim Voronov <ziflex@gmail.com>
Date: Tue, 28 Mar 2023 13:35:56 -0400
Subject: [PATCH] Updated lab runner

---
 .github/workflows/build.yml | 6 ++----
 Makefile                    | 3 ++-
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index c429da1f..9f84f993 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -60,9 +60,7 @@ jobs:
         run: |
           curl https://raw.githubusercontent.com/MontFerret/lab/master/install.sh -o install.sh
           chmod +x ./install.sh
-          mkdir $PWD/lab-bin
-          LOCATION=$PWD/lab-bin ./install.sh
-          export PATH=$PATH:$PWD/lab-bin
+          LOCATION=$PWD ./install.sh
 
       - name: Get dependencies
         run: make install
@@ -81,5 +79,5 @@ jobs:
       - name: E2E tests
         run: |
           docker run -d -p 9222:9222 ghcr.io/montferret/chromium:92.0.4512.0
-          make e2e
+          LAB_BIN=$PWD/lab make e2e
           docker stop $(docker ps -q)
diff --git a/Makefile b/Makefile
index 1afd9844..bbabe7bc 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,7 @@
 .PHONY: build install compile test e2e doc fmt lint vet release
 export CGO_ENABLED=0
 
+LAB_BIN ?= lab
 DIR_BIN = ./bin
 DIR_PKG = ./pkg
 DIR_E2E = ./e2e
@@ -29,7 +30,7 @@ cover:
 	curl -s https://codecov.io/bash | bash
 
 e2e:
-	lab --timeout=120 --attempts=5 --concurrency=1 --wait=http://127.0.0.1:9222/json/version --runtime=bin://./bin/ferret --files=./e2e/tests --cdn=./e2e/pages/dynamic --cdn=./e2e/pages/static
+	${LAB_BIN} --timeout=120 --attempts=5 --concurrency=1 --wait=http://127.0.0.1:9222/json/version --runtime=bin://./bin/ferret --files=./e2e/tests --cdn=./e2e/pages/dynamic --cdn=./e2e/pages/static
 
 bench:
 	go test -run=XXX -bench=. ${DIR_PKG}/...