浏览代码

test: fix e2e commands on Windows

Instead of trying to make this work nicely cross-platform,
just push the Coverage logic into the GitHub Actions job,
as that's really where we care about it.

(It's surprisingly difficult to make this nicely portable;
to make PowerShell not error out if the path does not exist
you have to ignore ALL errors and the way that env vars are
passed to processes is not the same.)

Signed-off-by: Milas Bowman <[email protected]>
Milas Bowman 2 年之前
父节点
当前提交
3b85cd2fa9
共有 2 个文件被更改,包括 7 次插入5 次删除
  1. 5 1
      .github/workflows/ci.yml
  2. 2 4
      Makefile

+ 5 - 1
.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' }}

+ 2 - 4
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