tyler.durden
/
compose
mirror of https://github.com/docker/compose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

test: fix e2e commands on Windows
This commit is contained in:
Milas Bowman 2023-03-24 12:13:42 -04:00 committed by GitHub
parent d818bf6f34 3b85cd2fa9
commit cc70851bc8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.github/workflows/ci.yml vendored
View File

@ -179,7 +179,11 @@ jobs:
name: Test plugin mode name: Test plugin mode
if: ${{ matrix.mode == 'plugin' }} if: ${{ matrix.mode == 'plugin' }}
run: | 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 name: Test standalone mode
if: ${{ matrix.mode == 'standalone' }} if: ${{ matrix.mode == 'standalone' }}

6
Makefile
View File

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