From dbfd947be4f2ed239981ce69339fc6059129fd55 Mon Sep 17 00:00:00 2001
From: Jari Kolehmainen <jari.kolehmainen@gmail.com>
Date: Tue, 6 Jul 2021 09:36:30 +0300
Subject: [PATCH] run integration tests against real build

Signed-off-by: Jari Kolehmainen <jari.kolehmainen@gmail.com>
---
 .github/workflows/test.yml | 13 +++++--------
 Makefile                   | 17 ++---------------
 2 files changed, 7 insertions(+), 23 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index c4a43f6eb4..2ce53e59e2 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -77,15 +77,12 @@ jobs:
           sudo chown -R $USER $HOME/.kube $HOME/.minikube
         name: Install integration test dependencies
         if: runner.os == 'Linux'
-      - run: xvfb-run --auto-servernum --server-args='-screen 0, 1600x900x24' make integration-linux
+
+      - run: xvfb-run --auto-servernum --server-args='-screen 0, 1600x900x24' make integration
         name: Run Linux integration tests
         if: runner.os == 'Linux'
 
-      - run: make integration-win
-        name: Run Windows integration tests
+      - run: make integration
+        name: Run integration tests
         shell: bash
-        if: runner.os == 'Windows'
-
-      - run: make integration-mac
-        name: Run macOS integration tests
-        if: runner.os == 'macOS'
+        if: runner.os != 'Linux'
diff --git a/Makefile b/Makefile
index d9a5fe1a83..8b2558e7f7 100644
--- a/Makefile
+++ b/Makefile
@@ -50,21 +50,8 @@ tag-release:
 test: binaries/client
 	yarn run jest $(or $(CMD_ARGS), "src")
 
-.PHONY: integration-linux
-integration-linux: binaries/client build-extension-types build-extensions
-	yarn build:linux
-	yarn integration
-
-.PHONY: integration-mac
-integration-mac: binaries/client build-extension-types build-extensions
-	# rm ${HOME}/Library/Application\ Support/Lens
-	yarn build:mac
-	yarn integration
-
-.PHONY: integration-win
-integration-win: binaries/client build-extension-types build-extensions
-	# rm %APPDATA%/Lens
-	yarn build:win
+.PHONY: integration
+integration: build
 	yarn integration
 
 .PHONY: build