Merge pull request #10403 from milas/fix-e2e-win

test: fix e2e commands on Windows
docker · Mar 24, 2023 · cc70851 · cc70851
2 parents d818bf6 + 3b85cd2
commit cc70851
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -179,7 +179,11 @@ jobs:
         name: Test plugin mode
         if: ${{ matrix.mode == 'plugin' }}
         run: |
-          make e2e-compose
+          rm -rf ./covdatafiles
+          mkdir ./covdatafiles
+          make e2e-compose GOCOVERDIR=covdatafiles
+          go tool covdata textfmt -i=covdatafiles -o=coverage.out
+
       -
         name: Test standalone mode
         if: ${{ matrix.mode == 'standalone' }}

diff --git a/Makefile b/Makefile
@@ -23,6 +23,7 @@ ifeq ($(OS),Windows_NT)
 else
     DETECTED_OS = $(shell uname -s)
 endif
+
 ifeq ($(DETECTED_OS),Linux)
 	MOBY_DOCKER=/usr/bin/docker
 endif
@@ -71,10 +72,7 @@ install: binary
 
 .PHONY: e2e-compose
 e2e-compose: ## Run end to end local tests in plugin mode. Set E2E_TEST=TestName to run a single test
-	rm -rf covdatafiles
-	mkdir covdatafiles
-	GOCOVERDIR=covdatafiles go test $(TEST_FLAGS) -count=1 ./pkg/e2e
-	go tool covdata textfmt -i=covdatafiles -o=coverage.out
+	go test $(TEST_FLAGS) -count=1 ./pkg/e2e
 
 .PHONY: e2e-compose-standalone
 e2e-compose-standalone: ## Run End to end local tests in standalone mode. Set E2E_TEST=TestName to run a single test